10.12bug

nickchange

2023-10-12 47e55835a858636a79930156cab7647821085c92

10.12bug

 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){


 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"));

    }


 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

 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"){

 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>

 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