feats

deploy/bootstrap

@@ -4,4 +4,9 @@
 
 appVer="3.0.4"
 
-java -jar ./shigongli-${appVer}.jar
+baseDIR=`pwd`
+
+export JAVA_HOME=${baseDIR}/jdk1.8.0_281
+export PATH=${JAVA_HOME}/bin:${PATH}
+
+${JAVA_HOME}/bin/java -jar ./shigongli-${appVer}.jar

deploy/bootstrap - 副本

@@ -0,0 +1,7 @@
+#!/bin/bash
+#
+#
+
+appVer="3.0.4"
+
+java -jar ./shigongli-${appVer}.jar

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>shigongli</artifactId>
-	<version>3.0.4</version>
+	<version>3.0.5</version>
 	<name>shigongli</name>
 	<description>Shi Gong Li</description>
 

src/main/java/com/yunzhi/shigongli/common/WxPayUtils.java

@@ -1,102 +1,102 @@
-package com.yunzhi.shigongli.common;
-
-import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
-import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
-import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
-import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
-import com.github.binarywang.wxpay.constant.WxPayConstants;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.yunzhi.shigongli.config.WeixinConfig;
-import com.yunzhi.shigongli.entity.TaOrder;
-import com.yunzhi.shigongli.entity.TaOrderPay;
-import com.yunzhi.shigongli.entity.TaOrderSub;
-import com.yunzhi.shigongli.entity.TaPerson;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-
-@Component
-public class WxPayUtils {
-    @Autowired
-    WeixinConfig config;
-
-    @Autowired
-    WxUtils wxUtils;
-
-    /**
-     * 下单
-     * @param person
-     * @param orderPay
-     * @return
-     * @throws Exception
-     */
-    public WxPayMpOrderResult createOrder(TaPerson person, TaOrderPay orderPay) throws Exception {
-        // 北京时间
-        LocalDateTime now = LocalDateTime.now(ZoneOffset.ofHours(8));
-        WxPayService payService = wxUtils.getPayService();
-
-        WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
-        orderRequest.setBody(orderPay.getDescription());
-        orderRequest.setOutTradeNo(orderPay.getPayId());
-        orderRequest.setTotalFee(orderPay.getCharges());
-        orderRequest.setOpenid(person.getOpenid());
-        orderRequest.setNotifyUrl(config.getPay().getNotifyUrl());
-        orderRequest.setSpbillCreateIp("218.91.253.51");  // 随便写个 IP
-        orderRequest.setTimeStart(DateUtils.toString(now, "yyyyMMddHHmmss"));
-        // 默认支付 30 分钟有效期
-        orderRequest.setTimeExpire(DateUtils.toString(now.plusMinutes(30), "yyyyMMddHHmmss"));
-
-        WxPayMpOrderResult payResult = payService.createOrder(orderRequest);
-        return payResult;
-    }
-
-//    /**
-//     * 订单退款
-//     * @param taOrder
-//     * @param cashback
-//     * @return
-//     * @throws Exception
-//     */
-//    public WxPayRefundResult refund(TaOrder taOrder, Integer cashback) throws Exception {
-//        WxPayService payService = wxUtils.getPayService();
-//        WxPayRefundRequest refundRequest = new WxPayRefundRequest();
-//        refundRequest.setOutTradeNo(taOrder.getOrderId());
-//        refundRequest.setOutRefundNo("R"+taOrder.getOrderId());
-//        refundRequest.setTotalFee(taOrder.getCharges());
-//        refundRequest.setRefundFee(taOrder.getCharges() - cashback);
-//        refundRequest.setNotifyUrl(config.getPay().getRefundNotifyUrl());
-//        WxPayRefundResult result = payService.refund(refundRequest);
-//
-//        if (!WxPayConstants.ResultCode.SUCCESS.equals(result.getResultCode())) {
-//            throw new Exception(result.getErrCodeDes());
-//        }
-//
-//        return result;
-//    }
-
-    /**
-     * 订单退款
-     * @param originOrderPay
-     * @param orderPay
-     * @return
-     * @throws Exception
-     */
-    public WxPayRefundResult refund(TaOrderPay originOrderPay, TaOrderPay orderPay) throws Exception {
-        WxPayService payService = wxUtils.getPayService();
-        WxPayRefundRequest refundRequest = new WxPayRefundRequest();
-        refundRequest.setOutTradeNo(originOrderPay.getPayId());
-        refundRequest.setOutRefundNo(orderPay.getPayId());
-        refundRequest.setTotalFee(originOrderPay.getCharges());
-        refundRequest.setRefundFee(orderPay.getCharges());
-        refundRequest.setNotifyUrl(config.getPay().getRefundNotifyUrl());
-        WxPayRefundResult result = payService.refund(refundRequest);
-
-        if (!WxPayConstants.ResultCode.SUCCESS.equals(result.getResultCode())) {
-            throw new Exception(result.getErrCodeDes());
-        }
-
-        return result;
-    }
-}
+package com.yunzhi.shigongli.common;
+
+import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
+import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
+import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
+import com.github.binarywang.wxpay.constant.WxPayConstants;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.yunzhi.shigongli.config.WeixinConfig;
+import com.yunzhi.shigongli.entity.TaOrder;
+import com.yunzhi.shigongli.entity.TaOrderPay;
+import com.yunzhi.shigongli.entity.TaOrderSub;
+import com.yunzhi.shigongli.entity.TaPerson;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+
+@Component
+public class WxPayUtils {
+    @Autowired
+    WeixinConfig config;
+
+    @Autowired
+    WxUtils wxUtils;
+
+    /**
+     * 下单
+     * @param person
+     * @param orderPay
+     * @return
+     * @throws Exception
+     */
+    public WxPayMpOrderResult createOrder(TaPerson person, TaOrderPay orderPay) throws Exception {
+        // 北京时间
+        LocalDateTime now = LocalDateTime.now(ZoneOffset.ofHours(8));
+        WxPayService payService = wxUtils.getPayService();
+
+        WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
+        orderRequest.setBody(orderPay.getDescription());
+        orderRequest.setOutTradeNo(orderPay.getPayId());
+        orderRequest.setTotalFee(orderPay.getCharges());
+        orderRequest.setOpenid(person.getOpenid());
+        orderRequest.setNotifyUrl(config.getPay().getNotifyUrl());
+        orderRequest.setSpbillCreateIp("218.91.253.51");  // 随便写个 IP
+        orderRequest.setTimeStart(DateUtils.toString(now, "yyyyMMddHHmmss"));
+        // 默认支付 30 分钟有效期
+        orderRequest.setTimeExpire(DateUtils.toString(now.plusMinutes(30), "yyyyMMddHHmmss"));
+
+        WxPayMpOrderResult payResult = payService.createOrder(orderRequest);
+        return payResult;
+    }
+
+//    /**
+//     * 订单退款
+//     * @param taOrder
+//     * @param cashback
+//     * @return
+//     * @throws Exception
+//     */
+//    public WxPayRefundResult refund(TaOrder taOrder, Integer cashback) throws Exception {
+//        WxPayService payService = wxUtils.getPayService();
+//        WxPayRefundRequest refundRequest = new WxPayRefundRequest();
+//        refundRequest.setOutTradeNo(taOrder.getOrderId());
+//        refundRequest.setOutRefundNo("R"+taOrder.getOrderId());
+//        refundRequest.setTotalFee(taOrder.getCharges());
+//        refundRequest.setRefundFee(taOrder.getCharges() - cashback);
+//        refundRequest.setNotifyUrl(config.getPay().getRefundNotifyUrl());
+//        WxPayRefundResult result = payService.refund(refundRequest);
+//
+//        if (!WxPayConstants.ResultCode.SUCCESS.equals(result.getResultCode())) {
+//            throw new Exception(result.getErrCodeDes());
+//        }
+//
+//        return result;
+//    }
+
+    /**
+     * 订单退款
+     * @param originOrderPay
+     * @param orderPay
+     * @return
+     * @throws Exception
+     */
+    public WxPayRefundResult refund(TaOrderPay originOrderPay, TaOrderPay orderPay) throws Exception {
+        WxPayService payService = wxUtils.getPayService();
+        WxPayRefundRequest refundRequest = new WxPayRefundRequest();
+        refundRequest.setOutTradeNo(originOrderPay.getPayId());
+        refundRequest.setOutRefundNo(orderPay.getPayId());
+        refundRequest.setTotalFee(originOrderPay.getCharges());
+        refundRequest.setRefundFee(orderPay.getCharges());
+        refundRequest.setNotifyUrl(config.getPay().getRefundNotifyUrl());
+        WxPayRefundResult result = payService.refund(refundRequest);
+
+        if (!WxPayConstants.ResultCode.SUCCESS.equals(result.getResultCode())) {
+            throw new Exception(result.getErrCodeDes());
+        }
+
+        return result;
+    }
+}

src/main/java/com/yunzhi/shigongli/config/CorsConfig.java

@@ -4,22 +4,25 @@ import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-@SpringBootConfiguration
-public class CorsConfig implements WebMvcConfigurer {
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        //添加映射路径
-        registry.addMapping("/**")
-                //是否发送Cookie
-                .allowCredentials(true)
-                //设置放行哪些原始域
-                .allowedOrigins("*")
-                //放行哪些请求方式
-                .allowedMethods("GET", "POST", "PUT", "DELETE")
-                //.allowedMethods("*") //或者放行全部
-                //放行哪些原始请求头部信息
-                .allowedHeaders("*")
-                //暴露哪些原始请求头部信息
-                .exposedHeaders("X-Authorization-JWT");
-    }
-}
+//@SpringBootConfiguration
+//public class CorsConfig implements WebMvcConfigurer {
+//    @Override
+//    public void addCorsMappings(CorsRegistry registry) {
+//        //添加映射路径
+//        registry.addMapping("/**")
+//                //是否发送Cookie
+//                .allowCredentials(true)
+//                //设置放行哪些原始域
+//                .allowedOrigins("*")
+//                //放行哪些请求方式
+//                .allowedMethods("GET", "POST", "PUT", "DELETE")
+//                //.allowedMethods("*") //或者放行全部
+//                //放行哪些原始请求头部信息
+//                .allowedHeaders("*")
+//                //暴露哪些原始请求头部信息
+//                .exposedHeaders("X-Authorization-JWT");
+//    }
+//}
+
+
+public class CorsConfig {}

src/main/java/com/yunzhi/shigongli/controller/TaNoteController.java

@@ -5,12 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.BaseController;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
-import com.yunzhi.shigongli.entity.TaImage;
-import com.yunzhi.shigongli.entity.TaNote;
-import com.yunzhi.shigongli.entity.TaNoteResource;
-import com.yunzhi.shigongli.service.ITaImageService;
-import com.yunzhi.shigongli.service.ITaNoteResourceService;
-import com.yunzhi.shigongli.service.ITaNoteService;
+import com.yunzhi.shigongli.entity.*;
+import com.yunzhi.shigongli.service.*;
 import com.yunzhi.shigongli.vo.NoteVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -49,6 +45,12 @@ public class TaNoteController extends BaseController {
     @Autowired
     public ITaNoteResourceService iTaNoteResourceService;
 
+    @Autowired
+    public ITaSaveService iTaSaveService;
+
+    @Autowired
+    public ITaLikeService iTaLikeService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -250,6 +252,7 @@ public class TaNoteController extends BaseController {
     @RequestMapping(value="/wx/note/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean getWxDetail(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        String personId = getCurrentPerson().getPersonId();
         TaNote taNote = iTaNoteService.getById(id);
         if (null == taNote || Constants.STATUS_DELETED == taNote.getStatus()) {
             return ResponseBean.error("没有找到更新内容", ResponseBean.ERROR_UNAVAILABLE);
@@ -258,9 +261,17 @@ public class TaNoteController extends BaseController {
         NoteVO noteVO = new NoteVO();
         BeanUtils.copyProperties(taNote, noteVO);
 
+        TaSave taSave = iTaSaveService.getByTarget(Constants.TARGET_NOTE, id, personId);
+        if (null != taSave) {
+            noteVO.setIsSaved(1);
+        }
+        TaLike taLike = iTaLikeService.getByTarget(Constants.TARGET_NOTE, id, personId);
+        if (null != taLike) {
+            noteVO.setIsLike(1);
+        }
 
         noteVO.setImageList(iTaImageService.getListBy(Constants.TARGET_NOTE, id));
-        noteVO.setWxResourceList(iTaNoteResourceService.getResourceListBy(id, getCurrentPerson().getPersonId()));
+        noteVO.setWxResourceList(iTaNoteResourceService.getResourceListBy(id, personId));
 
         return ResponseBean.success(noteVO);
     }

src/main/java/com/yunzhi/shigongli/entity/TaNote.java

@@ -1,6 +1,7 @@
 package com.yunzhi.shigongli.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -61,5 +62,11 @@ public class TaNote implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "是否收藏")
+    Integer isSaved;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "距离")
+    Float distance;
 }

src/main/java/com/yunzhi/shigongli/vo/NoteVO.java

@@ -2,7 +2,6 @@ package com.yunzhi.shigongli.vo;
 
 import com.yunzhi.shigongli.entity.TaImage;
 import com.yunzhi.shigongli.entity.TaNoteResource;
-import com.yunzhi.shigongli.entity.TaResource;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -55,4 +54,13 @@ public class NoteVO {
 
     @ApiModelProperty(value = "笔记资源-微信端")
     private List<ResourceListVO> wxResourceList;
+
+    @ApiModelProperty(value = "是否收藏")
+    private Integer isSaved;
+
+    @ApiModelProperty(value = "是否爆赞")
+    private Integer isLike;
+
+    @ApiModelProperty(value = "距离")
+    private Float distance;
 }

src/main/resources/mapper/TaNoteMapper.xml

@@ -21,29 +21,24 @@
     </select>
     <select id="getWxPageBy" resultType="com.yunzhi.shigongli.entity.TaNote">
         SELECT
-            t.*
+            t.*,
+            IFNULL(n.saved_num, 0) as is_saved
         FROM
             ta_note t
-                LEFT JOIN (
+            LEFT JOIN (
                 SELECT
-                    *
+                    a.target_type,
+                    a.target_id,
+                    count( 1 ) AS saved_num
                 FROM
-                    (
-                        SELECT
-                            c.*,
-                            fn_distance ( #{location}, concat( a.lng, ',', a.lat ) ) AS distance
-                        FROM
-                            ta_resource a
-                                INNER JOIN ta_save b ON b.target_type = a.target_type
-                                AND b.target_id = a.target_id
-                                INNER JOIN ta_note_resource c ON c.resource_no = a.resource_no
-                        WHERE
-                            b.person_id = #{personId}
-                    ) d
-                ORDER BY
-                    d.distance DESC
-                    LIMIT 1
-            ) s ON s.note_id = t.note_id
+                    ta_save a
+                WHERE
+                    a.person_id = #{personId}
+                    AND a.target_type = 'note'
+                GROUP BY
+                    a.target_type,
+                    a.target_id
+                ) n ON n.target_id = t.note_id
         WHERE
             t.`status` > - 1
         <if test="summary != null and summary != ''">
@@ -51,7 +46,7 @@
         </if>
         ORDER BY
             IF
-                ( s.note_id IS NULL, 0, 1 ) DESC,
+                ( t.note_id IS NULL, 0, 1 ) DESC,
             t.create_date DESC
     </select>
 </mapper>