浏览代码

优化优惠卷领取,优化充值记录

goods20 3 月之前
父节点
当前提交
845c4345ed

+ 2 - 2
ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://60.204.149.27:13306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://8.152.217.177:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: root
+                password: Sh@852741.
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

+ 2 - 2
ruoyi-admin/src/main/resources/application.yml

@@ -69,13 +69,13 @@ spring:
     # redis 配置
     redis:
       # 地址
-      host: 60.204.149.27
+      host: 8.152.217.177
       # 端口,默认为6379
       port: 6379
       # 数据库索引
       database: 0
       # 密码
-      password:
+      password: Sh@852741.
       # 连接超时时间
       timeout: 10s
       lettuce:

+ 1 - 0
ruoyi-framework/src/main/java/com/ruoyi/framework/recovery/domain/RecSaleInfo.java

@@ -53,6 +53,7 @@ public class RecSaleInfo extends BaseEntity
     /**
      * 活动结束时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTimeOfActivity;
 
     /** 创建时间 */

+ 4 - 1
ruoyi-wx/src/main/java/com/ruoyi/wx/web/domain/vo/SaleInfoVo.java

@@ -56,7 +56,10 @@ public class SaleInfoVo implements Serializable {
      * 是否发售
      */
     private boolean isStore;
-
+    /**
+     * 活动图片
+     */
+    private String images;
     /**
      * 置顶排序
      */