From ee8cf37876af04c9ba2a63cf55b73bfab90e33f1 Mon Sep 17 00:00:00 2001 From: haotianmingyue <2421912570@qq.com> Date: Mon, 14 Oct 2024 09:15:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8622=20banxiongbanji=E4=B8=AD=E7=A7=BB?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/xmComtroller/CalculateController.java | 8 +------- ruoyi-admin/src/main/java/com/ruoyi/web/utils/XMUtil.java | 3 ++- ruoyi-admin/src/main/resources/application.yml | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/CalculateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/CalculateController.java index e199d15f..a2b16545 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/CalculateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/CalculateController.java @@ -188,13 +188,7 @@ public class CalculateController extends BaseController { XMUtil.getElementByNum(tiange) , XMUtil.getElementByNum(renge), XMUtil.getElementByNum(dige)); - //--------20241013修改--将家庭格中数理吉凶中的含义最后添加家庭运--------------------------- - // -// String hanyi = shuliJixiong.getHanyi(); -// shuliJixiong.setHanyi(hanyi+'\n'+jiating); -// System.out.println(hanyi); -// System.out.println(jiating); - //----------end--20241013----------------- + MarriedVo marriedVo = new MarriedVo(); marriedVo.setJiating(jiating); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/XMUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/XMUtil.java index ef1b42f0..6e1e6e95 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/XMUtil.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/XMUtil.java @@ -24,7 +24,8 @@ public class XMUtil { 16, 17, 18, 21, 23, 24, 25, 29, 31, 32, 33, 35, 37, 39, 41, 45, 47, 48, 52, 57, 61, 63, 65, 67, 68, 81}; private static int[] XIONG = {2, 4, 9, 10, 12, 14, 19, 20, 22, 26, 28, 34, 42, 43, 44, 46, 54, 56, 59, 60, 62, 64, 66, 69, 70, 71, 72, 74, 76, 79, 80}; - private static int[] BANXIONGBANJI = {22, 27, 30, 36, 38, 40, 49, 50, 51, 53, 55, 58, 73, 75, 77, 78}; + //----20241014 将 22 移出 banxiongbanji。--------------------------- + private static int[] BANXIONGBANJI = {27, 30, 36, 38, 40, 49, 50, 51, 53, 55, 58, 73, 75, 77, 78}; private static String xiangke = "姓名中的天格、地格五行相克的少年运，代表着1一15岁的运程中很难享受健全的家庭氛围。在此阶段就承受相当的痛苦，在恐惧不安中成长，身体弱病灾连。不仅茫然，还易卷入家庭或亲友之问的纠纷中，心里易扭曲，影响到婚姻或事业，由于家庭的不稳定因素，导致挫折与失败，争论不合，易陷入孤独悲凄之中生死离别。在事业、工作中，常受压迫与部下的攻击，如坐针毡，易生突发事件。由于先天条件的不足失去成功机遇。唯有天格木克地格土可安稳，不易变动，立如坚石，身体健康。也要观察数理吉凶，大多凶兆。"; private static String xiangtongmu = "姓名中的天格与地格同为木，少年运安泰，受长辈疼爱，打下良好基础。能得到贵人相助，身心健康，得到良好的教育，人生观正确。爱情、事业基础稳固、夫妻互助、和谐美满幸福。数凶者少时会有病难之苦，总体运吉。"; diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 560b43f4..0fe9b421 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -72,7 +72,7 @@ spring: # 地址 # host: 172.17.0.4 host: localhost - # 端口，默认为6379 +# 端口，默认为6379 port: 6379 # 数据库索引 database: 0