Merge remote-tracking branch 'origin/dev' into dev

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/controller/AuthController.java

@@ -201,7 +201,7 @@ public class AuthController {
                     data.put("token",token);
                 }else {
                     data.put("status",ResultCode.FAILED_CODE);
-                    data.put("message","登录失败");
+                    data.put("message","非内部员工，无法登录");
                 }
             }
         }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserLogRemarkDTO.java

 package com.github.wxiaoqi.security.admin.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -16,9 +18,11 @@ public class AppUserLogRemarkDTO {
     private String remark;
 
     /**
-     * 创建时间
+     * 日志时间
      */
-    private Date crtTime;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date time;
 
     /**
      * 用户id
@@ -27,4 +31,5 @@ public class AppUserLogRemarkDTO {
 
 
 
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserLogRemark.java

 package com.github.wxiaoqi.security.admin.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 import javax.persistence.Column;
@@ -32,4 +34,8 @@ public class AppUserLogRemark {
     @Column(name = "level_id")
     private Integer levelId;
 
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date time;
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserLogRemarkBiz.java

@@ -44,6 +44,7 @@ public class AppUserLogRemarkBiz extends BaseBiz<AppUserLogRemarkMapper, AppUser
 
         Example example = new Example(AppUserLogRemark.class);
         example.createCriteria().andEqualTo("levelId", levelId);
+        example.orderBy("time").desc();
         List<AppUserLogRemark> list = selectByExample(example);
         return list;
     }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeBiz.java

@@ -106,7 +106,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
                         if (jsonArray != null) {
                             JSONObject jsonObject1 = jsonArray.getJSONObject(num - 1);
                             if (jsonObject1 != null) {
-                                double amountString = jsonObject1.getInteger("amount");
+                                double amountString = jsonObject1.getDouble("amount");
                                 amount = amount + amountString;
                             }
                         }