0307v2.0

health/src/main/java/com/ccsens/health/api/DebugController.java

@@ -32,8 +32,8 @@ public class DebugController {
     })
     @RequestMapping(value="qrcode",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
     public JsonResponse qrcode(HttpServletRequest request) throws Exception {
-        WxXcxUtil.getWxCode("pages/sign/sign?siteId=1235756988936359936&scene=1011&siteName=TSG&type=in"
-                ,"1011", "/home/cloud/tall/uploads/112233.jpg");
+        WxXcxUtil.getWxCode("pages/sign/sign"
+                ,"scene=1011&siteName=TSG","/home/cloud/tall/uploads/112233.png");
         return JsonResponse.newInstance().ok("完成");
     }
 }

health/src/main/java/com/ccsens/health/bean/dto/JourneyDto.java

@@ -10,7 +10,7 @@ public class JourneyDto {
     @Data
     @ApiModel("上报行程")
     public static class JourneyInfo{
-        @ApiModelProperty("'出行方式'")
+        @ApiModelProperty("出行方式 0铁路 1飞机 2客运车辆 3自驾 4船 5其他")
         private int tripMode;
         @ApiModelProperty("车次号")
         private String carNo;

health/src/main/java/com/ccsens/health/bean/vo/UserVo.java

@@ -28,7 +28,7 @@ public class UserVo {
         private List<HealthCode> healthCodeList;
     }
     @Data
-    @ApiModel("查询个人信息")
+    @ApiModel("个人健康码信息")
     public static class HealthCode{
         @ApiModelProperty("打卡时间")
         private Long time;

util/src/main/java/com/ccsens/util/CodeEnum.java

@@ -96,7 +96,7 @@ public enum CodeEnum {
     ALREADY_ATTENTION(79,"您已经关注了这个项目",true),
     NOT_EMPLOYEE(80,"未找到成员信息",true),
     NOT_SITE(81,"未找到该场所",true),
-    ALREADY_REAL_AUTH(81,"未找到该场所",true)
+    ALREADY_REAL_AUTH(82,"您已经完成认证",true)
     ;
 
     public CodeEnum addMsg(String msg){

util/src/main/java/com/ccsens/util/wx/WxXcxUtil.java

@@ -16,6 +16,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.ConnectException;
+import java.nio.Buffer;
 import java.util.*;
 
 @Data
@@ -65,7 +66,7 @@ public class WxXcxUtil {
         public String page;
         public Integer width;
         public Boolean auto_color;
-        public Boolean line_color;
+        public Object line_color;
         public Boolean is_hyaline;
     }
 
@@ -226,10 +227,10 @@ public class WxXcxUtil {
         WechatCode wechatCode = new WechatCode();
         wechatCode.page = page;
         wechatCode.scene = scene;
+        wechatCode.line_color = "#800080";
 
         String postStr = JacksonUtil.beanToJson(wechatCode);
         System.out.println(postStr);
-
         HttpsUtil.httpsRequest(url,"POST",postStr,path);
     }