Skip to content
[Jenkins]Jenkins
log in

Changes

Summary

  1. 添加test-ws配置 (details)
  2. 修改test-ws配置 (details)
  3. 配置redis (details)
  4. x (details)
  5. 调整测试环境的redis (details)
  6. 投保状态同步定时任务调整 (details)
  7. 修改redis外网为内网 (details)
  8. 新增陕西内网环境配置 (details)
  9. 企业端华为云配置 (details)
  10. 华为云配置监管端 (details)
  11. 调整数据库链接信息 (details)
  12. 提交2 (details)
  13. 提交3 (details)
  14. 调整测试监管的外部数据库和redis (details)
  15. 调整外网IP (details)
  16. 添加晋城配置 (details)
  17. 晋城内网配置 (details)
  18. 修复晋城连接信息 (details)
  19. 晋城禁止投保状态 (details)
  20. 调整政务外网 (details)
Commit d0c933c42ec7fa6aff1efbfbc680f69dc156ebf5 by pxw87952434
添加test-ws配置
The file was addedidentity-server/identity-web-api/src/main/resources/application-test-in-ws.yml
The file was addedtenant-shared-rest-web-api/src/main/resources/application-test-in-ws.yml
The file was addedtenant-backend-task/src/main/resources/application-test-in-ws.yml
The file was addedtenant-server/tenant-web-api/src/main/resources/application-test-in-ws.yml
The file was addedtenant-bus/tenant-bus-api/src/main/resources/application-test-in-ws.yml
The file was addedtenant-rest-web-api/src/main/resources/application-test-in-ws.yml
The file was addedidentity-server/identity-web-api/src/main/resources/application-test-ws.yml
The file was addedtenant-bus/tenant-bus-api/src/main/resources/application-test-ws.yml
The file was addedtenant-shared-rest-web-api/src/main/resources/application-test-ws.yml
The file was addedsecurity-server/security-web-api/src/main/resources/application-test-in-ws.yml
The file was addedtenant-backend-task/src/main/resources/application-test-ws.yml
The file was addedtenant-rbac-server/tenant-rbac-api/src/main/resources/application-test-in-ws.yml
The file was addedsecurity-server/security-web-api/src/main/resources/application-test-ws.yml
The file was addedtenant-rbac-server/tenant-rbac-api/src/main/resources/application-test-ws.yml
The file was addedtenant-rest-web-api/src/main/resources/application-test-ws.yml
The file was addedtenant-server/tenant-web-api/src/main/resources/application-test-ws.yml
Commit 8bc2b32331c3f9ef9be779c82c19d8dea1cd6525 by pxw87952434
修改test-ws配置
The file was modified tenant-backend-task/src/main/resources/application-test-ws.yml
The file was modified tenant-server/tenant-web-api/pom.xml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-test-in-ws.yml
The file was modified security-server/security-web-api/src/main/resources/application-test-ws.yml
The file was modified tenant-rest-web-api/src/main/resources/application-test-ws.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-test-ws.yml
The file was modified identity-server/identity-web-api/pom.xml
The file was modified security-server/security-web-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-rest-web-api/pom.xml
The file was modified tenant-bus/tenant-bus-api/pom.xml
The file was modified security-server/security-web-api/pom.xml
The file was modified tenant-shared-rest-web-api/pom.xml
The file was modified tenant-backend-task/src/main/resources/application-test-in-ws.yml
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-test-ws.yml
The file was modified tenant-rest-web-api/src/main/resources/application-test-in-ws.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-test-ws.yml
The file was modified tenant-rbac-server/tenant-rbac-api/pom.xml
The file was modified tenant-backend-task/pom.xml
Commit 283c55ead9bcd47b6b8d0c1664b970db4f958fb0 by linhancheng
配置redis
The file was modified tenant-backend-task/src/main/resources/application-test-ws.yml
Commit 8f69b964371bce8072dcba9f43a7d291da8a38a7 by linhancheng
x
The file was modified tenant-backend-task/src/main/resources/application-dev-ws.yml
The file was modified tenant-rest-web-api/src/main/resources/application-dev-ws.yml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-dev-ws.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-dev-ws.yml
Commit ea765634c95344e31f9c5e89a7ba49337b31e969 by linhancheng
调整测试环境的redis
The file was modified identity-server/identity-web-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-rest-web-api/src/main/resources/application-dev-ws-security.yml
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-test-ws.yml
The file was modified tenant-backend-task/src/main/resources/application-dev-ws-security.yml
The file was modified tenant-rest-web-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-rest-web-api/src/main/resources/application-test-ws.yml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-dev-ws-security.yml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-test-ws.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-dev-ws-security.yml
The file was modified security-server/security-web-api/src/main/resources/application-dev-ws.yml
The file was modified security-server/security-web-api/src/main/resources/application-test-ws.yml
The file was modified security-server/security-web-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-test-in-ws.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-test-ws.yml
The file was modified tenant-backend-task/src/main/resources/application-test-ws.yml
The file was modified security-server/security-web-api/src/main/resources/application-dev-ws-security.yml
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-dev-ws-security.yml
The file was modified tenant-backend-task/src/main/resources/application-test-in-ws.yml
Commit e1d11cda02881de03d337a9e0183febf44049f99 by 1923680292
投保状态同步定时任务调整
The file was modified tenant-backend-task/src/main/java/com/bcxin/tenant/backend/tasks/EmployeeIsSureSyncTask.java
Commit bef1d8c68b7d591581db229afae0dc9f905cec6b by 1923680292
修改redis外网为内网
The file was modified tenant-backend-task/src/main/resources/application-dev-ws.yml
The file was modified security-server/security-web-api/src/main/resources/application-test-ws.yml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-backend-task/src/main/resources/application-test-in-ws.yml
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-dev-ws-security.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-dev-ws.yml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-dev-ws.yml
The file was modified security-server/security-web-api/src/main/resources/application-dev-ws-security.yml
The file was modified tenant-rest-web-api/src/main/resources/application-test-ws.yml
The file was modified tenant-backend-task/src/main/resources/application-dev-ws-security.yml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-dev-ws-security.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-dev-ws-security.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-test-in-ws.yml
The file was modified security-server/security-web-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-test-ws.yml
The file was modified tenant-rest-web-api/src/main/resources/application-dev-ws-security.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-test-ws.yml
The file was modified tenant-backend-task/src/main/resources/application-test-ws.yml
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-rest-web-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-rest-web-api/src/main/resources/application-dev-ws.yml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-test-ws.yml
The file was modified security-server/security-web-api/src/main/resources/application-dev-ws.yml
Commit ce420a0868d3793fa7653fb0d5ac70071675ccd9 by 1923680292
新增陕西内网环境配置
The file was addedsecurity-server/security-web-api/src/main/resources/application-shanxi-in-prod.yml
The file was modified tenant-backend-task/src/main/resources/application-shanxi-in-prod.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-shanxi-in-prod.yml
The file was modified tenant-rest-web-api/src/main/resources/application-shanxi-in-prod.yml
The file was modified security-server/security-web-api/pom.xml
The file was modified tenant-shared-rest-web-api/src/main/resources/application-shanxi-in-prod.yml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-shanxi-in-prod.yml
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-shanxi-in-prod.yml
Commit fd59893826a23931e8806fb033d1f73ae2d2ff33 by daiqincheng
企业端华为云配置
The file was modified tenant-backend-task/src/main/resources/application-test-ws.yml
The file was modified tenant-rest-web-api/src/main/resources/application-test-ws.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-test-ws.yml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-test-ws.yml
The file was modified security-server/security-web-api/src/main/resources/application-test-ws.yml
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-test-ws.yml
Commit 3b67100a68306bf1ad90d248a3fd4bf438c9775a by daiqincheng
华为云配置监管端
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-rest-web-api/src/main/resources/application-test-in-ws.yml
The file was modified security-server/security-web-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-backend-task/src/main/resources/application-test-in-ws.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-test-in-ws.yml
Commit 7b7d0a723945520b1093bc6fe4ef9766bf300281 by linhancheng
调整数据库链接信息
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-test-ws.yml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-test-ws.yml
The file was modified tenant-rest-web-api/src/main/resources/application-test-ws.yml
The file was modified tenant-backend-task/src/main/resources/application-test-ws.yml
The file was modified security-server/security-web-api/src/main/resources/application-test-ws.yml
Commit 7c0394dea68e83e8e07188c533afd5208809b697 by 1923680292
提交2

# Conflicts:
#	tenant-backend-task/src/main/java/com/bcxin/tenant/backend/BackConfig.java
The file was modified tenant-backend-task/src/main/java/com/bcxin/tenant/backend/BackConfig.java
The file was modified infrastructures/tenant-api-interface/src/main/java/com/bcxin/api/interfaces/tenants/responses/InvitedToJoinQueuesGetResponse.java
The file was modified tenant-rest-web-api/src/main/java/com/bcxin/rest/web/apis/controllers/InviteDepartController.java
Commit 0d1940e99ad663471f2eb9e707d83be7e3d91064 by 1923680292
提交3
The file was modified tenant-backend-task/src/main/resources/application-test-ws.yml
Commit 1ee45289df48d0f015a3bbb241ac90c742f203b9 by linhancheng
调整测试监管的外部数据库和redis
The file was modified security-server/security-web-api/src/main/resources/application-test-ws.yml
The file was modified tenant-backend-task/src/main/resources/application-test-ws.yml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-test-ws.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-test-ws.yml
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-test-ws.yml
The file was modified tenant-rest-web-api/src/main/resources/application-test-ws.yml
Commit 7aaf002a9e68eaf3b0bb6cdc945f42133a9c8025 by linhancheng
调整外网IP
The file was modified tenant-server/tenant-web-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-test-in-ws.yml
The file was modified tenant-backend-task/src/main/resources/application-test-in-ws.yml
The file was modified tenant-rest-web-api/src/main/resources/application-test-in-ws.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-test-in-ws.yml
The file was modified security-server/security-web-api/src/main/resources/application-test-in-ws.yml
Commit 749629b7cc44ab3a7347c0505c78da97cf323e1e by daiqincheng
添加晋城配置
The file was modified tenant-rbac-server/tenant-rbac-api/pom.xml
The file was addedtenant-server/tenant-web-api/src/main/resources/application-jincheng-out-prod.yml
The file was addedsecurity-server/security-web-api/src/main/resources/application-jincheng-out-prod.yml
The file was modified identity-server/identity-web-api/pom.xml
The file was modified tenant-bus/tenant-bus-api/pom.xml
The file was modified tenant-shared-rest-web-api/pom.xml
The file was addedtenant-shared-rest-web-api/src/main/resources/application-jincheng-in-prod.yml
The file was addedtenant-rbac-server/tenant-rbac-api/src/main/resources/application-jincheng-in-prod.yml
The file was addedtenant-backend-task/src/main/resources/application-jincheng-in-prod.yml
The file was modified tenant-backend-task/pom.xml
The file was modified security-server/security-web-api/pom.xml
The file was addedtenant-bus/tenant-bus-api/src/main/resources/application-jincheng-in-prod.yml
The file was addedtenant-shared-rest-web-api/src/main/resources/application-jincheng-out-prod.yml
The file was addedtenant-rbac-server/tenant-rbac-api/src/main/resources/application-jincheng-out-prod.yml
The file was modified tenant-rest-web-api/pom.xml
The file was addedtenant-server/tenant-web-api/src/main/resources/application-jincheng-in-prod.yml
The file was addedidentity-server/identity-web-api/src/main/resources/application-jincheng-in-prod.yml
The file was addedtenant-backend-task/src/main/resources/application-jincheng-out-prod.yml
The file was addedsecurity-server/security-web-api/src/main/resources/application-jincheng-in-prod.yml
The file was addedtenant-rest-web-api/src/main/resources/application-jincheng-in-prod.yml
The file was addedtenant-rest-web-api/src/main/resources/application-jincheng-out-prod.yml
The file was modified tenant-server/tenant-web-api/pom.xml
The file was addedtenant-bus/tenant-bus-api/src/main/resources/application-jincheng-out-prod.yml
The file was addedidentity-server/identity-web-api/src/main/resources/application-jincheng-out-prod.yml
Commit 00479c7ce9af9d9073464040bfc32d4ef473971e by daiqincheng
晋城内网配置
The file was modified tenant-server/tenant-web-api/src/main/resources/application-jincheng-in-prod.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-jincheng-in-prod.yml
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-jincheng-in-prod.yml
The file was modified tenant-rest-web-api/src/main/resources/application-jincheng-in-prod.yml
The file was modified tenant-backend-task/src/main/resources/application-jincheng-in-prod.yml
The file was modified tenant-shared-rest-web-api/src/main/resources/application-jincheng-in-prod.yml
The file was modified security-server/security-web-api/src/main/resources/application-jincheng-in-prod.yml
Commit 772b9080399e039ab7d9779133514cd24eb22353 by linhancheng
修复晋城连接信息
The file was modified tenant-backend-task/src/main/resources/application-jincheng-out-prod.yml
The file was modified security-server/security-web-api/src/main/resources/application-jincheng-out-prod.yml
The file was modified tenant-rbac-server/tenant-rbac-api/src/main/resources/application-jincheng-out-prod.yml
The file was modified tenant-rest-web-api/src/main/resources/application-jincheng-out-prod.yml
The file was modified identity-server/identity-web-api/src/main/resources/application-jincheng-out-prod.yml
The file was modified tenant-server/tenant-web-api/src/main/resources/application-jincheng-out-prod.yml
Commit 511a17d41b8c21a09fd46eb3f4ee8866cd0d956d by linhancheng
晋城禁止投保状态
The file was modified tenant-backend-task/src/main/java/com/bcxin/tenant/backend/tasks/EmployeeIsSureSyncTask.java
Commit b8638583c2aa1dad3cda523157092d9db1f0a5e0 by linhancheng
调整政务外网
The file was modified tenant-backend-task/src/main/resources/application-jincheng-out-prod.yml