bugfix

pom.xml

@@ -132,6 +132,12 @@
 				<profiles.active>prod</profiles.active>
 			</properties>
 		</profile>
+		<profile>
+			<id>xs</id>
+			<properties>
+				<profiles.active>xs</profiles.active>
+			</properties>
+		</profile>
 	</profiles>
 	<build>
 		<plugins>

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

@@ -67,7 +67,6 @@ public class MiniAppController {
         if (StringUtils.isBlank(code)) {
             return ResponseBean.error("参数 code 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-
         try {
             WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code);
 
@@ -81,8 +80,18 @@ public class MiniAppController {
             if (null == taPerson) {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
-            taPerson.setFromCode(from);
-            taPerson.setRecommendPerson(recommender);
+            if(StringUtils.isEmpty(taPerson.getFromCode())){
+                taPerson.setFromCode(from);
+            }
+            if(StringUtils.isEmpty(taPerson.getRecommendPerson())){
+                taPerson.setRecommendPerson(recommender);
+                TaPerson type = taPersonService.getById(recommender);
+                if(null != type){
+                    if(!StringUtils.isEmpty(type.getPersonType())){
+                        taPerson.setRecommendPersonType(type.getPersonType());
+                    }
+                }
+            }
             taPersonService.updateById(taPerson);
 
             taPerson.setPassword(null);

src/main/java/com/huiju/estateagents/controller/TaPointsExchangeController.java

@@ -1,231 +1,234 @@
-package com.huiju.estateagents.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huiju.estateagents.base.BaseController;
-import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.entity.TaPointsExchange;
-import com.huiju.estateagents.service.ITaPointsExchangeService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
-    * 积分兑换记录  前端控制器
-    * </p>
- *
- * @author jobob
- * @since 2019-07-25
- */
-@RestController
-@RequestMapping("/api")
-public class TaPointsExchangeController extends BaseController {
-
-    private final Logger logger = LoggerFactory.getLogger(TaPointsExchangeController.class);
-
-    @Autowired
-    public ITaPointsExchangeService iTaPointsExchangeService;
-
-
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/admin/taPointsExchange",method= RequestMethod.GET)
-    public ResponseBean taPointsExchangeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                             @RequestParam(value ="personName",required = false) String personName,
-                                             @RequestParam(value ="phone",required = false) String phone,
-                                             @RequestParam(value ="personType",required = false) String personType,
-                                             @RequestParam(value ="targetName",required = false) String targetName,
-                                             @RequestParam(value ="startCreateDate",required = false) String startCreateDate,
-                                             @RequestParam(value ="endCreateDate",required = false) String endCreateDate,
-                                             @RequestParam(value ="startVerifyDate",required = false) String startVerifyDate,
-                                             @RequestParam(value ="endVerifyDate",required = false) String endVerifyDate,
-                                             @RequestParam(value ="status",required = false) Integer status,
-                                             @RequestParam(value ="tel",required = false) String tel){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            //使用分页插件
-            TaPointsExchange taPointsExchange = new TaPointsExchange();
-            taPointsExchange.setPersonName(personName);
-            taPointsExchange.setPhone(phone);
-            taPointsExchange.setPersonType(personType);
-            taPointsExchange.setTargetName(targetName);
-            taPointsExchange.setStartCreateDate(startCreateDate);
-            taPointsExchange.setEndCreateDate(endCreateDate);
-            taPointsExchange.setStartVerifyDate(startVerifyDate);
-            taPointsExchange.setEndVerifyDate(endVerifyDate);
-            taPointsExchange.setStatus(status);
-            taPointsExchange.setTel(tel);
-            
-            responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange);
-
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taPointsExchangeList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-    
-    /**
-     * 修改对象
-     * @param taPointsExchange 实体对象
-     * @return
-     */
-    @RequestMapping(value="/admin/taPointsExchange/change",method= RequestMethod.PUT)
-    public ResponseBean taPointsExchangeStatusChange(@RequestBody TaPointsExchange taPointsExchange){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if (null != taPointsExchange.getStatus() && !taPointsExchange.getStatus().equals(CommConstant.STATUS_NORMAL)){
-                taPointsExchange.setStatus(CommConstant.STATUS_NORMAL);
-            }
-            if (iTaPointsExchangeService.updateById(taPointsExchange)){
-                responseBean.addSuccess(taPointsExchange);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taPointsExchangeUpdate -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 保存对象
-     * @param taPointsExchange 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taPointsExchange",method= RequestMethod.POST)
-    public ResponseBean taPointsExchangeAdd(@RequestBody TaPointsExchange taPointsExchange){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if (iTaPointsExchangeService.save(taPointsExchange)){
-                responseBean.addSuccess(taPointsExchange);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taPointsExchangeAdd -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @ResponseBody
-    @RequestMapping(value="/taPointsExchange/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taPointsExchangeDelete(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            if(iTaPointsExchangeService.removeById(id)){
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taPointsExchangeDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 修改对象
-     * @param recId  实体ID
-     * @return
-     */
-    @RequestMapping(value="/admin/taPointsExchange/{recId}",method= RequestMethod.PUT)
-    public ResponseBean taPointsExchangeUpdate(@PathVariable Integer recId){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            TaPointsExchange taPointsExchange = iTaPointsExchangeService.getById(recId);
-            if (null == taPointsExchange){
-                responseBean.addError("找不到需要核销的商品");
-                return responseBean;
-            }
-            if (taPointsExchange.getStatus().equals(CommConstant.STATUS_NORMAL)){
-                responseBean.addError("此商品已经被领取");
-                return responseBean;
-            }
-            taPointsExchange.setStatus(CommConstant.STATUS_NORMAL);
-            if (iTaPointsExchangeService.updateById(taPointsExchange)){
-                responseBean.addSuccess(taPointsExchange);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taPointsExchangeUpdate -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taPointsExchange/{id}",method= RequestMethod.GET)
-    public ResponseBean taPointsExchangeGet(@PathVariable Integer id){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            responseBean.addSuccess(iTaPointsExchangeService.getById(id));
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taPointsExchangeDelete -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-    
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/wx/taPointsExchange",method= RequestMethod.GET)
-    public ResponseBean wxPointsExchangeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                             @RequestParam(value = "buildingId", required = false) String buildingId,
-                                             @RequestParam(value = "personId", required = false) String personId){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            //使用分页插件
-            IPage<TaPointsExchange> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaPointsExchange> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq(null != personId, "person_id", personId);
-            queryWrapper.eq(null != buildingId, "building_id",buildingId);
-            queryWrapper.orderByDesc("create_date");
-            
-            IPage<TaPointsExchange> result = iTaPointsExchangeService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taPointsExchangeList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
-}
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaPointsExchange;
+import com.huiju.estateagents.service.ITaPointsExchangeService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 积分兑换记录  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@RestController
+@RequestMapping("/api")
+public class TaPointsExchangeController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaPointsExchangeController.class);
+
+    @Autowired
+    public ITaPointsExchangeService iTaPointsExchangeService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taPointsExchange",method= RequestMethod.GET)
+    public ResponseBean taPointsExchangeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                             @RequestParam(value ="personName",required = false) String personName,
+                                             @RequestParam(value ="phone",required = false) String phone,
+                                             @RequestParam(value ="personType",required = false) String personType,
+                                             @RequestParam(value ="targetName",required = false) String targetName,
+                                             @RequestParam(value ="startCreateDate",required = false) String startCreateDate,
+                                             @RequestParam(value ="endCreateDate",required = false) String endCreateDate,
+                                             @RequestParam(value ="startVerifyDate",required = false) String startVerifyDate,
+                                             @RequestParam(value ="endVerifyDate",required = false) String endVerifyDate,
+                                             @RequestParam(value ="status",required = false) Integer status,
+                                             @RequestParam(value ="tel",required = false) String tel){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            TaPointsExchange taPointsExchange = new TaPointsExchange();
+            taPointsExchange.setPersonName(personName);
+            taPointsExchange.setPhone(phone);
+            taPointsExchange.setPersonType(personType);
+            taPointsExchange.setTargetName(targetName);
+            taPointsExchange.setStartCreateDate(startCreateDate);
+            taPointsExchange.setEndCreateDate(endCreateDate);
+            taPointsExchange.setStartVerifyDate(startVerifyDate);
+            taPointsExchange.setEndVerifyDate(endVerifyDate);
+            taPointsExchange.setStatus(status);
+            taPointsExchange.setTel(tel);
+            
+            responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange);
+
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 修改对象
+     * @param taPointsExchange 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taPointsExchange/change",method= RequestMethod.PUT)
+    public ResponseBean taPointsExchangeStatusChange(@RequestBody TaPointsExchange taPointsExchange){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (null != taPointsExchange.getStatus() && !taPointsExchange.getStatus().equals(CommConstant.STATUS_NORMAL)){
+                taPointsExchange.setStatus(CommConstant.STATUS_NORMAL);
+            }
+            if (iTaPointsExchangeService.updateById(taPointsExchange)){
+                responseBean.addSuccess(taPointsExchange);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taPointsExchange 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taPointsExchange",method= RequestMethod.POST)
+    public ResponseBean taPointsExchangeAdd(@RequestBody TaPointsExchange taPointsExchange){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaPointsExchangeService.save(taPointsExchange)){
+                responseBean.addSuccess(taPointsExchange);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taPointsExchange/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taPointsExchangeDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaPointsExchangeService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param recId  实体ID
+     * @return
+     */
+    @RequestMapping(value="/admin/taPointsExchange/{recId}",method= RequestMethod.PUT)
+    public ResponseBean taPointsExchangeUpdate(@PathVariable Integer recId){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaPointsExchange taPointsExchange = iTaPointsExchangeService.getById(recId);
+            if (null == taPointsExchange){
+                responseBean.addError("找不到需要核销的商品");
+                return responseBean;
+            }
+            if (taPointsExchange.getStatus().equals(CommConstant.STATUS_NORMAL)){
+                responseBean.addError("此商品已经被领取");
+                return responseBean;
+            }
+            taPointsExchange.setStatus(CommConstant.STATUS_NORMAL);
+            taPointsExchange.setVerifyDate(LocalDateTime.now());
+            if (iTaPointsExchangeService.updateById(taPointsExchange)){
+                responseBean.addSuccess(taPointsExchange);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taPointsExchange/{id}",method= RequestMethod.GET)
+    public ResponseBean taPointsExchangeGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaPointsExchangeService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taPointsExchange",method= RequestMethod.GET)
+    public ResponseBean wxPointsExchangeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                             @RequestParam(value = "buildingId", required = false) String buildingId,
+                                             @RequestParam(value = "personId", required = false) String personId){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaPointsExchange> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPointsExchange> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(null != personId, "person_id", personId);
+            queryWrapper.eq(null != buildingId, "building_id",buildingId);
+            queryWrapper.orderByDesc("create_date");
+            
+            IPage<TaPointsExchange> result = iTaPointsExchangeService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -17,7 +17,8 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/wx/chat", // 聊天暂时不鉴权
             "/api/wx/login",
             "/api/admin/signin",
-            "/api/taCheckin/activity"
+            "/api/taCheckin/activity",
+            "/api/wx/qrcode/scene"
     };
 
     /*

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -277,7 +277,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Override
     public IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,String building){
-        String personId = taRecommendCustomerMapper.getCustomerById(customerId).getRecommendPerson();
+        String personId = taRecommendCustomerMapper.getCustomerById(customerId).getPersonId();
         QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
         // todo
         // 此处可能不是 person_id 而是 recommend_person

src/main/java/com/huiju/estateagents/service/impl/TaShareServiceImpl.java

@@ -61,7 +61,7 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
             QueryWrapper<TaBuildingDynamic> taBuildingDynamicQuery= new QueryWrapper<>();
             taBuildingDynamicQuery.eq("dynamic_id",id);
             TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectOne(taBuildingDynamicQuery);
-            taBuildingDynamicMapper.updateById( taBuildingDynamic.setShareNum(taBuildingDynamic.getShareNum()+1));
+            taBuildingDynamicMapper.updateById( taBuildingDynamic.setShareNum(taBuildingDynamic.getShareNum() == null ? 1:taBuildingDynamic.getShareNum()+1));
             return ResponseBean.success("成功");
         }
 

src/main/java/com/huiju/estateagents/service/impl/TaUvServiceImpl.java

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaUv;
+import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaUvMapper;
 import com.huiju.estateagents.service.ITaUvService;
@@ -33,6 +34,9 @@ public class TaUvServiceImpl extends ServiceImpl<TaUvMapper, TaUv> implements IT
     @Autowired
     TaUvMapper taUvMapper;
 
+    @Autowired
+    TaBuildingMapper buildingMapper;
+
     @Override
     public ResponseBean saveData(String openid, String typeOf, String id) {
         List<TaPerson> persons = getPersonsByOpenId(openid);
@@ -73,9 +77,12 @@ public class TaUvServiceImpl extends ServiceImpl<TaUvMapper, TaUv> implements IT
         }
 
         // 如果是点赞置业, 则人员点赞 + 1
-        if (typeOf == CommConstant.FAVOR_CONSULTANT) {
+        if (typeOf.equals(CommConstant.FAVOR_CONSULTANT)) {
             taPersonMapper.setFieldIncrement(id,"hot_num", 1);
         }
+        if (typeOf.equals(CommConstant.FAVOR_PROJECT)) {
+            buildingMapper.setFieldNum(id,"pv_num",1);
+        }
 
         return ResponseBean.success("");
     }

src/main/resources/application-xs.yml

@@ -0,0 +1,51 @@
+server:
+  port: 8003
+spring:
+  application:
+    name: estateagents
+  datasource:
+    username: estateagents
+    password: DQ@0lW##kBb2+-jPZ
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents2?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    initial-size: 10 # 初始化连接数
+    max-active: 20 # 最大连接数
+    min-idle: 8 # 最小空闲数
+    max-idle: 8 # 最大空闲数
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 50MB
+
+##mybatis-plus
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    call-setters-on-nulls: true
+  mapper-locations: classpath:mapper/*.xml
+wx:
+  miniapp:
+    appid: wx09cd665abf378db7
+    secret: a6cbd778272c87426952b5a1f8449698
+    token:
+    aesKey:
+    msgDataFormat: JSON
+  tpls:
+    - name: notice
+      id: thSzcSAhIHiZZuCdydBsoB-dSa_g72vHgqo9e_CltNM
+      keywords: 4
+    - name: newCustomer
+      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
+      keywords: 4
+    - name: mainbiz
+      id: iJLceA_zp1fq9xnL4yV8IOwWGeFHebCO-HxNtcPYLoA
+      keywords: 6
+ali:
+  accessKeyId: LTAIkc75dpkJw8Lb
+  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  oss:
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    bucketName: estateagents
+    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+
+