Merge branch '1.1.x'
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 89ae34a..92fcd8a 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -74,8 +74,20 @@
#### 1.1.x
-##### 1.1.12 （SNAPSHOT）
+##### 1.1.13 （SNAPSHOT）
+fix: 一人多帐号的数据同步时，只对已存在的帐号的用户信息可以更新；对于新增帐号时，已存在的用户信息不可更新
+docs: 新增脚本，帐号临时表 增加 PASSWORD 字段
+fix: 支持同步接口，初始化帐号的密码
+chore: 升级版本，1.1.13-SNAPSHOT
+
+
+##### 1.1.12
+
+chore: 发布修复版本，1.1.12-RELEASE
+fix: 修正eventListenerExecutor 线程池配置，调整队列大小
+style: 整理用户安全手机、安全邮箱的相关接口
+fix: 修正接口请求报错
chore: 升级版本，1.1.12-SNAPSHOT
@@ -421,8 +433,18 @@
#### 1.1.x
-##### 1.1.10 （SNAPSHOT）
+##### 1.1.11 （SNAPSHOT）
+chore: 升级版本，1.1.11-SNAPSHOT
+
+
+##### 1.1.10
+
+chore: 发布修复版本，1.1.10-RELEASE
+feat: 支持PC端最小屏幕分辨率 1024 * 768
+fix: 对图片进行缓存优化
+fix: 优化xml解析的性能问题
+feat: 增加 thread dump 接口，方便性能排查
chore: 升级版本，1.1.10-SNAPSHOT
@@ -903,8 +925,31 @@
#### 1.0.x
-##### 1.0.10 （SNAPSHOT）
+##### 1.0.13 （SNAPSHOT）
+chore: 升级版本，1.0.13-SNAPSHOT
+
+
+##### 1.0.12
+
+chore: 发布修复版本，1.0.12-RELEASE
+fix: 兼容集美大学密码加密算法
+chore: 升级版本，1.0.12-SNAPSHOT
+
+
+##### 1.0.11
+
+chore: 发布修复版本，1.0.11-RELEASE
+fix: 修正响应的 code
+fix: 修正帐号激活，验证验证码 读取的数据错误
+fix: 支持预留手机直接作为安全手机（支持独立提交接口）
+chore: 升级版本，1.0.11-SNAPSHOT
+
+
+##### 1.0.10
+
+chore: 发布修复版本，1.0.10-RELEASE
+feat: 判断上传文件的后缀限制（/uploadIdentityPic）
chore: 升级版本，1.0.10-SNAPSHOT
@@ -1117,8 +1162,26 @@
#### 1.1.x
-##### 1.1.2 （SNAPSHOT）
+##### 1.1.4 （SNAPSHOT）
+chore: 升级版本，1.1.4-SNAPSHOT
+
+
+##### 1.1.3
+
+chore: 发布修复版本，1.1.3-RELEASE
+修改绑定邮箱校验两次问题
+预留手机号设置为安全手机
+chore: 升级版本，1.1.3-SNAPSHOT
+
+
+##### 1.1.2
+
+chore: 发布修复版本，1.1.2-RELEASE
+fix: 修改bug
+fix: 修改手机号校验问题
+fix: 修改手机号校验提示
+fix: 账号激活，手机号已绑定校验
fix： 账号激活信息填写错误后提交报错修改
fix: 没有身份认证，跳转到绑定手机，邮箱
chore: 升级版本，1.1.2-SNAPSHOT
@@ -1182,8 +1245,15 @@
#### 1.0.x
+##### 1.0.3 （SNAPSHOT）
+
+fix: 支持同步帐号，初始化帐号的密码
+chore: 升级版本 1.0.3-SNAPSHOT
+
+
##### 1.0.2
+fix: 修正帐号数据缺少证件信息的问题
fix: 修正处理状态，将处理成功的数据 的 TRANS_STATUS 标记为 4 处理成功
refactor: 西工大，调整部门数据
chore: 升级版本 1.0.2-SNAPSHOT
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml
index 7033291..9a21d97 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml
@@ -28,7 +28,7 @@
containers:
- name: cas-server-installer
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/cas-server/cas-server-installer:1.1.9-RELEASE
+ image: harbor.supwisdom.com/cas-server/cas-server-installer:1.1.10-RELEASE
imagePullPolicy: Always
envFrom:
- configMapRef:
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml
index 3c6ba68..a753beb 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml
@@ -95,7 +95,7 @@
containers:
- name: cas-server-sa-api
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/cas-server/cas-server-sa-api:1.1.9-RELEASE
+ image: harbor.supwisdom.com/cas-server/cas-server-sa-api:1.1.10-RELEASE
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml
index 11a51ba..6185328 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml
@@ -62,7 +62,7 @@
containers:
- name: cas-server-security-engine
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/cas-server/cas-server-security-engine:1.1.9-RELEASE
+ image: harbor.supwisdom.com/cas-server/cas-server-security-engine:1.1.10-RELEASE
imagePullPolicy: Always
ports:
- containerPort: 6060
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.4.cas-server-uidws.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.4.cas-server-uidws.yaml
index 1b1a31e..2dc6367 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.4.cas-server-uidws.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.4.cas-server-uidws.yaml
@@ -81,7 +81,7 @@
spec:
containers:
- name: cas-server-uidws
- image: harbor.supwisdom.com/cas-server/cas-server-uidws:1.1.9-RELEASE
+ image: harbor.supwisdom.com/cas-server/cas-server-uidws:1.1.10-RELEASE
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml
index e67d331..8d144f2 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml
@@ -220,7 +220,7 @@
containers:
- name: cas-server-site-webapp
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/cas-server/cas-server-site-webapp:1.1.9-RELEASE
+ image: harbor.supwisdom.com/cas-server/cas-server-site-webapp:1.1.10-RELEASE
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.6.cas-server-site-scheme.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.6.cas-server-site-scheme.yaml
index 3510c4e..05313aa 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.6.cas-server-site-scheme.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.6.cas-server-site-scheme.yaml
@@ -95,7 +95,7 @@
memory: "256Mi"
- name: cas-server-site-scheme-generator
# 根据情况修改镜像地址
- image: harbor.supwisdom.com/cas-server/cas-server-site-scheme:1.1.9-RELEASE
+ image: harbor.supwisdom.com/cas-server/cas-server-site-scheme:1.1.10-RELEASE
imagePullPolicy: Always
envFrom:
- configMapRef:
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml
index bcafafe..db3ac9a 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml
@@ -42,7 +42,7 @@
containers:
- name: cas-server-datax-job
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/cas-server/cas-server-datax-job:1.1.9-RELEASE
+ image: harbor.supwisdom.com/cas-server/cas-server-datax-job:1.1.10-RELEASE
imagePullPolicy: Always
envFrom:
- configMapRef:
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.4.personal-security-center-bff.yaml b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.4.personal-security-center-bff.yaml
index 4a1c9fb..0fcf977 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.4.personal-security-center-bff.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.4.personal-security-center-bff.yaml
@@ -211,7 +211,7 @@
containers:
- name: personal-security-center-bff
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/personal-security-center/personal-security-bff:1.0.9-RELEASE
+ image: harbor.supwisdom.com/personal-security-center/personal-security-bff:1.0.12-RELEASE
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.5.personal-security-center-zuul.yaml b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.5.personal-security-center-zuul.yaml
index 44f140e..0ec4ca3 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.5.personal-security-center-zuul.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.5.personal-security-center-zuul.yaml
@@ -150,7 +150,7 @@
containers:
- name: personal-security-center-zuul
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/personal-security-center/personal-security-zuul:1.0.9-RELEASE
+ image: harbor.supwisdom.com/personal-security-center/personal-security-zuul:1.0.12-RELEASE
imagePullPolicy: Always
ports:
- containerPort: 8080
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml
index c7584ba..b1ad69e 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/6.personal-security-center/4.9.security-center-ui.yaml
@@ -55,7 +55,7 @@
containers:
- name: security-center-ui
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/personal-security-center/security-center-ui:1.1.1-RELEASE
+ image: harbor.supwisdom.com/personal-security-center/security-center-ui:1.1.3-RELEASE
imagePullPolicy: Always
ports:
- containerPort: 80
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/4.1.jobs-server.yaml b/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/4.1.jobs-server.yaml
index ce9d771..bbcea06 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/4.1.jobs-server.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/4.1.jobs-server.yaml
@@ -160,7 +160,7 @@
containers:
- name: jobs-server
# 若使用了学校搭设的私有仓库，请修改
- image: harbor.supwisdom.com/jobs-server/jobs-server:1.0.0-RELEASE
+ image: harbor.supwisdom.com/jobs-server/jobs-server:1.0.3-SNAPSHOT
imagePullPolicy: Always
ports:
- containerPort: 6060