feat:修复已知问题，提升系统稳定性

2024-09-01 20:08:53 +08:00
parent 27f7a5a15c
commit b637a50f20
8 changed files with 96 additions and 47 deletions
--- a/derby.log
+++ b/derby.log
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------
-Fri Aug 30 00:51:04 CST 2024:
-Booting Derby version The Apache Software Foundation - Apache Derby - 10.14.2.0 - (1828579): instance a816c00e-0191-9f0c-2ce5-0000036aae18 
-on database directory memory:D:\Codes\remi\remi-cloud\dfd497d2-d2b5-4bc0-86c9-059abfd1e783 with class loader jdk.internal.loader.ClassLoaders$AppClassLoader@60e53b93 
+Sun Sep 01 18:41:22 CST 2024:
+Booting Derby version The Apache Software Foundation - Apache Derby - 10.14.2.0 - (1828579): instance a816c00e-0191-ad2c-c686-0000036bbdc8 
+on database directory memory:D:\Codes\remi\remi-cloud\89214bae-f382-410d-9398-d81b9a733106 with class loader jdk.internal.loader.ClassLoaders$AppClassLoader@60e53b93 
 Loaded from file:/D:/Maven/sdt-repository/org/apache/derby/derby/10.14.2.0/derby-10.14.2.0.jar
 java.vendor=Amazon.com Inc.
 java.runtime.version=17.0.11+9-LTS
--- a/remi-nacos/src/main/resources/application.yml
+++ b/remi-nacos/src/main/resources/application.yml
@@ -9,8 +9,8 @@ db:
  user: ${MYSQL_USER:root}
  password: ${MYSQL_PWD:Remi@123}
  url:
-    0: jdbc:mysql://${MYSQL_HOST:192.168.31.202}:${MYSQL_PORT:30336}/${MYSQL_DB:remi-cloud}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-    #0: jdbc:mysql://${MYSQL_HOST:192.168.31.66}:${MYSQL_PORT:3306}/${MYSQL_DB:sit-cloud}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    #0: jdbc:mysql://${MYSQL_HOST:192.168.31.202}:${MYSQL_PORT:30336}/${MYSQL_DB:remi-cloud}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    0: jdbc:mysql://${MYSQL_HOST:192.168.31.200}:${MYSQL_PORT:30336}/${MYSQL_DB:remi-cloud}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
  pool:
    config:
      connectionTimeout: 30000
--- a/remi-nacos/src/main/resources/docker/docker_deploy.sh
+++ b/remi-nacos/src/main/resources/docker/docker_deploy.sh
@@ -1,15 +1,15 @@
 #先删除原有的镜像
-docker stop sit-remi-base-nacos
-docker rm -f sit-remi-base-nacos
-docker images | grep sit-remi-base-nacos | awk '{print $3}' | xargs docker rmi -f
-docker build -t sit-remi-base-nacos .
-docker images | grep sit-remi-base-nacos
+docker stop sit-remi-nacos-web
+docker rm -f sit-remi-nacos-web
+docker images | grep sit-remi-nacos-web | awk '{print $3}' | xargs docker rmi -f
+docker build -t sit-remi-nacos-web .
+docker images | grep sit-remi-nacos-web
 #把新镜像推送到私服
 docker login -uadmin -pYdsz1020 harbor.njydsz.com
-docker tag sit-remi-base-nacos harbor.njydsz.com/remi/sit-remi-base-nacos:3.1.0
-docker tag sit-remi-base-nacos harbor.njydsz.com/remi/sit-remi-base-nacos
-docker push harbor.njydsz.com/remi/sit-remi-base-nacos:3.1.0
-docker push harbor.njydsz.com/remi/sit-remi-base-nacos
+docker tag sit-remi-nacos-web harbor.njydsz.com/remi/sit-remi-nacos-web:3.1.0
+docker tag sit-remi-nacos-web harbor.njydsz.com/remi/sit-remi-nacos-web
+docker push harbor.njydsz.com/remi/sit-remi-nacos-web:3.1.0
+docker push harbor.njydsz.com/remi/sit-remi-nacos-web
 #启动最新的镜像服务
-docker run --restart=always -t -dit -p 8848:8848 --name sit-remi-base-nacos sit-remi-base-nacos
+docker run --restart=always -t -dit -p 8848:8848 --name sit-remi-nacos-web sit-remi-nacos-web
 docker ps -a
--- a/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/UserController.java
+++ b/remi-sys/remi-sys-web/src/main/java/ai/remi/sys/web/controller/UserController.java
@@ -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("更新密码成功！");
    }

    /**
--- a/remi-sys/remi-sys-web/src/main/resources/bootstrap.yml
+++ b/remi-sys/remi-sys-web/src/main/resources/bootstrap.yml
@@ -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


--- a/remi-sys/remi-sys-web/src/main/resources/docker/remi-sys-web.yaml
+++ b/remi-sys/remi-sys-web/src/main/resources/docker/remi-sys-web.yaml
@@ -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
--- a/remi-sys/remi-sys-web/src/main/resources/i18n/messages_en_US.properties
+++ b/remi-sys/remi-sys-web/src/main/resources/i18n/messages_en_US.properties
@@ -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
--- a/remi-sys/remi-sys-web/src/main/resources/i18n/messages_zh_CN.properties
+++ b/remi-sys/remi-sys-web/src/main/resources/i18n/messages_zh_CN.properties
@@ -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异常