Merge branch '20250221_sun' of sckj/mz-cloud into master

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtJkzkServiceImpl.java

@@ -74,6 +74,7 @@ public class GljtJkzkServiceImpl implements IGljtJkzkService
     {
         GljtJkzk res = gljtJkzkMapper.selectById(id);
         if (!ObjectUtils.isEmpty(res)) {
+            EncryptionUtils.decryptForPlaintext(res);
             GljtSqLr lr = gljtSqLrMapper.selectOne(new LambdaQueryWrapper<GljtSqLr>()
                     .eq(GljtSqLr::getSqrZjhm, SecurityUtils.sm4encrypt_ECB(EncryptionUtils.key, res.getSfzh())));
             if (!ObjectUtils.isEmpty(lr)) {

ruoyi-ui-gljt/vue.config.js

@@ -46,22 +46,22 @@ module.exports = {
         // target: `http://10.16.4.5:8080`,//孙坤阳
         // target: `http://10.16.4.9:8080`,//初标
         // target: `http://10.16.4.14:801/prod-api`,//本地服务器
-        // target: `http://localhost:8080`,
+        target: `http://localhost:8080`,
         // target: `https://www.jlyanglao.com/prod-api`,
         // target: `http://121.36.73.159:801/prod-api`,
         // target: `http://121.36.73.159:815/prod-api`,//养老院
-        target: `https://jdgl.ccsckj.com/prod-api`,
+        // target: `https://jdgl.ccsckj.com/prod-api`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
         }
       },
       '/uploadPath': {
-        // target: `http://localhost:8080/file/uploadPath`,
+        target: `http://localhost:8080/file/uploadPath`,
         // target: `http://10.16.4.5:8080/uploadPath`,//孙坤阳
         // target: `https://www.jlyanglao.com/uploadPath`,
         // target: `http://10.16.4.14:801/uploadPath`,//本地服务器
-        target: `https://jdgl.ccsckj.com/uploadPath`,
+        // target: `https://jdgl.ccsckj.com/uploadPath`,
         // target: `http://121.36.73.159:815/uploadPath`,//养老院
         changeOrigin: true,
         pathRewrite: {