feat:修复已知问题,提升系统稳定性
This commit is contained in:
@@ -166,7 +166,9 @@ public class UserController {
|
||||
@RequestParam("nowPassword") String nowPassword,
|
||||
@RequestParam("newPassword") String newPassword) {
|
||||
//执行数据更新
|
||||
return ResultBean.success(userService.updatePwd(userId, nowPassword, newPassword));
|
||||
boolean updated = userService.updatePwd(userId, nowPassword, newPassword);
|
||||
AssertUtils.isTrue(updated, MessageUtils.getMessage("update.user.pwd.error"));
|
||||
return ResultBean.success("更新密码成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -6,46 +6,32 @@ spring:
|
||||
application:
|
||||
name: remi-sys-web
|
||||
profiles:
|
||||
active: dev
|
||||
#active: sit
|
||||
#active: dev
|
||||
active: sit
|
||||
cloud:
|
||||
# nacos
|
||||
nacos:
|
||||
# 注册中心
|
||||
username: nacos
|
||||
password: nacos
|
||||
discovery:
|
||||
# 配置中心的地址
|
||||
server-addr: ${NACOS_HOST:192.168.31.18}:${NACOS_PORT:8848}
|
||||
#server-addr: ${NACOS_HOST:192.168.31.201}:${NACOS_PORT:8848}
|
||||
#命名空间
|
||||
namespace: ${SERVICE_NAME_SPACE_NAME:dev}
|
||||
#namespace: ${SERVICE_NAME_SPACE_NAME:sit}
|
||||
# 配置文件的环境
|
||||
group: ${SERVICE_DISCOVERY_GROUP_NAME:dev}
|
||||
#group: ${SERVICE_DISCOVERY_GROUP_NAME:sit}
|
||||
# 配置中心
|
||||
#server-addr: ${NACOS_HOST:192.168.31.18}:${NACOS_PORT:8848}
|
||||
server-addr: ${NACOS_HOST:192.168.31.200}:${NACOS_PORT:30888}
|
||||
#namespace: ${SERVICE_NAME_SPACE_NAME:dev}
|
||||
namespace: ${NAME_SPACE:sit}
|
||||
#group: ${SERVICE_DISCOVERY_GROUP_NAME:dev}
|
||||
group: ${GROUP_NAME:sit}
|
||||
config:
|
||||
# 配置中心的地址
|
||||
server-addr: ${spring.cloud.nacos.discovery.server-addr}
|
||||
#命名空间
|
||||
namespace: ${spring.cloud.nacos.discovery.namespace}
|
||||
# 配置文件prefix
|
||||
prefix: ${spring.application.name}
|
||||
# 配置文件的环境
|
||||
group: ${spring.cloud.nacos.discovery.group}
|
||||
# 配置文件的格式
|
||||
#server-addr: ${NACOS_HOST:192.168.31.18}:${NACOS_PORT:8848}
|
||||
server-addr: ${NACOS_HOST:192.168.31.200}:${NACOS_PORT:30888}
|
||||
#namespace: ${SERVICE_NAME_SPACE_NAME:dev}
|
||||
namespace: ${NAME_SPACE:sit}
|
||||
#group: ${SERVICE_DISCOVERY_GROUP_NAME:dev}
|
||||
group: ${GROUP_NAME:sit}
|
||||
file-extension: yaml
|
||||
# 配置的编码
|
||||
encode: UTF-8
|
||||
# 是否开启监听和自动刷新
|
||||
refresh-enabled: true
|
||||
# 共享配置
|
||||
encode: UTF-8
|
||||
shared-configs:
|
||||
# Data Id 的默认完整格式为: ${prefix}-${spring.profile.active}.${file-extension}。
|
||||
- dataId: remi-cloud-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
group: ${spring.cloud.nacos.discovery.group}
|
||||
#是否自动刷新
|
||||
- dataId: remi-cloud-${spring.profiles.active}.yaml
|
||||
group: ${SERVICE_DISCOVERY_GROUP_NAME:sit}
|
||||
refresh: true
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
## Service
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: sit-remi-sys-web
|
||||
labels:
|
||||
app: sit-remi-sys-web
|
||||
spec:
|
||||
type: NodePort
|
||||
ports:
|
||||
- name: sit-remi-sys-web
|
||||
port: 1010
|
||||
protocol: TCP
|
||||
targetPort: 1010
|
||||
nodePort: 30010
|
||||
selector:
|
||||
app: sit-remi-sys-web
|
||||
---
|
||||
## Deployment
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: sit-remi-sys-web
|
||||
labels:
|
||||
app: sit-remi-sys-web
|
||||
spec:
|
||||
replicas: 2
|
||||
selector:
|
||||
matchLabels:
|
||||
app: sit-remi-sys-web
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: sit-remi-sys-web
|
||||
spec:
|
||||
containers:
|
||||
- image: harbor.njydsz.com/remi-top/sit-remi-sys-web
|
||||
imagePullPolicy: Always
|
||||
name: sit-remi-sys-web
|
||||
ports:
|
||||
- containerPort: 1010
|
||||
protocol: TCP
|
||||
env:
|
||||
- name: spring.profiles.active
|
||||
value: sit #改环境
|
||||
resources:
|
||||
limits:
|
||||
cpu: "1"
|
||||
memory: "500Mi"
|
||||
requests:
|
||||
cpu: "0.2"
|
||||
memory: "200Mi"
|
||||
volumeMounts:
|
||||
- name: logs
|
||||
mountPath: /logs
|
||||
volumes:
|
||||
- name: logs
|
||||
persistentVolumeClaim:
|
||||
claimName: remi-log
|
||||
@@ -21,6 +21,7 @@ add.roleCord.error=The same cord {0} already exists?
|
||||
add.rolePost.error=The same post {0} already exists?
|
||||
add.roleGroup.error=The same group {0} already exists?
|
||||
check.login.error=The username or password is wrong, please check and try again!
|
||||
update.user.pwd.error=Exception when updating user password, please check and try again!
|
||||
#****************************????****************************
|
||||
other.system.error=Other system error
|
||||
call.feign.error=Call feign error
|
||||
|
||||
@@ -22,6 +22,7 @@ add.roleCord.error=当前角色下已存在该组织,请检查组织:{0}!
|
||||
add.rolePost.error=当前角色下已存在该岗位,请检查岗位:{0}!
|
||||
add.roleGroup.error=当前角色下已存在该用户组,请检查用户组:{0}!
|
||||
check.login.error=用户名或密码错误,请检查后重试!
|
||||
update.user.pwd.error=更新用户密码异常,请检查后重试!
|
||||
#****************************三方异常****************************
|
||||
other.system.error=三方系统异常
|
||||
call.feign.error=调用Feign异常
|
||||
|
||||
Reference in New Issue
Block a user