From 47e55835a858636a79930156cab7647821085c92 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 12 十月 2023 18:06:43 +0800
Subject: [PATCH] 10.12bug

---
 cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java |    5 ++++-
 cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java                  |    4 ++++
 cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js        |    2 ++
 cloud-server-other/src/main/resources/mapper/SiteMapper.xml                              |    6 +++++-
 cloud-server-management/src/main/resources/redis.properties                              |   17 ++++++-----------
 cloud-server-other/src/main/resources/redis.properties                                   |    3 ---
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index bc36b4a..b0f28e2 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -94,7 +94,10 @@
 
                     detailsVo.setSex(tAppUser.getGender() == 1 ? "男" : "女");
                 }
-                detailsVo.setBirthday(format1.format(tAppUser.getBirthday()));
+                System.out.println("============="+tAppUser);
+
+                if (tAppUser.getBirthday()!=null){
+                detailsVo.setBirthday(format1.format(tAppUser.getBirthday()));}
                 detailsVo.setAddress(tAppUser.getProvince()+tAppUser.getCity());
                 if(tAppUser.getVipEndTime()!=null){
 
diff --git a/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java b/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java
index e3455a0..e9dcbde 100644
--- a/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java
+++ b/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java
@@ -17,6 +17,10 @@
 
     @Test
     void contextLoads() {
+        System.out.println(System.getProperty("java.version"));
+        System.out.println(System.getProperty("java.compiler"));
+        System.out.println(System.getProperty("java.vm.specification.version"));
+        System.out.println(System.getProperty("java.specification.version"));
 
     }
 
diff --git a/cloud-server-management/src/main/resources/redis.properties b/cloud-server-management/src/main/resources/redis.properties
index d5506fd..c9ed9de 100644
--- a/cloud-server-management/src/main/resources/redis.properties
+++ b/cloud-server-management/src/main/resources/redis.properties
@@ -1,21 +1,16 @@
-#redis���ÿ�ʼ
-# Redis���ݿ�������Ĭ��Ϊ0��
+
 spring.redis.database=0
-# Redis��������ַ
 spring.redis.host=@redis.addr@
-# Redis���������Ӷ˿�
 spring.redis.port=@redis.port@
-# Redis�������������루Ĭ��Ϊ�գ�
+
 spring.redis.password=@redis.password@
-# ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
+
 spring.redis.jedis.pool.max-active=1024
-# ���ӳ���������ȴ�ʱ�䣨ʹ�ø�ֵ��ʾû�����ƣ�
+
 spring.redis.jedis.pool.max-wait=10000
-# ���ӳ��е�����������
+
 spring.redis.jedis.pool.max-idle=200
-# ���ӳ��е���С��������
+
 spring.redis.jedis.pool.min-idle=50
-# ���ӳ�ʱʱ�䣨���룩
 spring.redis.timeout=10000
-#redis���ý���
 spring.redis.block-when-exhausted=true
\ No newline at end of file
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
index 862075b..9ddafc4 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
@@ -524,6 +524,8 @@
         }
 
     }
+
+
     //提交信息
     var ajax = new $ax(Feng.ctxPath + "/tShop/update", function(data){
         if(data=="5001"){
diff --git a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
index 87454da..4a9f884 100644
--- a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
@@ -128,7 +128,11 @@
                 and t1.name like concat('%',#{query.name},'%')
             </if>
             and t1.state != 3
-            and t1.insuranceEndTime &lt;= DATE_ADD(CURDATE(), INTERVAL 2 MONTH);
+            and t1.insuranceEndTime &lt;= DATE_ADD(CURDATE(), INTERVAL 2 MONTH)
+
+
         </where>
+
+        ORDER BY insertTime desc
     </select>
 </mapper>
diff --git a/cloud-server-other/src/main/resources/redis.properties b/cloud-server-other/src/main/resources/redis.properties
index 0e934d1..c8cd188 100644
--- a/cloud-server-other/src/main/resources/redis.properties
+++ b/cloud-server-other/src/main/resources/redis.properties
@@ -1,9 +1,6 @@
 spring.redis.database=0
-# Redis��������ַ
 spring.redis.host=@redis.addr@
-# Redis���������Ӷ˿�
 spring.redis.port=@redis.port@
-# Redis�������������루Ĭ��Ϊ�գ�
 spring.redis.password=@redis.password@
 spring.redis.jedis.pool.max-active=1024
 spring.redis.jedis.pool.max-wait=10000

--
Gitblit v1.7.1