feats

pom.xml

@@ -9,10 +9,10 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.huiju</groupId>
-	<artifactId>estateagents</artifactId>
+	<artifactId>zcloud</artifactId>
 	<version>v3.5.29</version>
-	<name>estateages</name>
-	<description>置业经纪人</description>
+	<name>zhiyun</name>
+	<description>致云</description>
 
 	<properties>
 		<java.version>1.8</java.version>
@@ -158,27 +158,15 @@
 
 	<profiles>
 		<profile>
-			<id>green</id>
+			<id>dev</id>
 			<properties>
-				<profiles.active>green</profiles.active>
+				<profiles.active>dev</profiles.active>
 			</properties>
 		</profile>
 		<profile>
-			<id>prod-blue</id>
+			<id>prod</id>
 			<properties>
-				<profiles.active>prod-blue</profiles.active>
-			</properties>
-		</profile>
-		<profile>
-			<id>prod-green</id>
-			<properties>
-				<profiles.active>prod-green</profiles.active>
-			</properties>
-		</profile>
-		<profile>
-			<id>blue</id>
-			<properties>
-				<profiles.active>blue</profiles.active>
+				<profiles.active>prod</profiles.active>
 			</properties>
 		</profile>
 	</profiles>

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

@@ -0,0 +1,139 @@
+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.common.CommonUtils;
+import com.huiju.estateagents.common.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+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 com.huiju.estateagents.service.ITaShopService;
+import com.huiju.estateagents.entity.TaShop;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 商户  前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2020-11-03
+ */
+
+@Api(tags = "商户 ")
+@RestController
+@RequestMapping("/api")
+public class TaShopController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaShopController.class);
+
+    @Autowired
+    public ITaShopService iTaShopService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/shop",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getList(@ApiParam("客户端") @PathVariable String client,
+                                @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                @ApiParam("商铺名称") @RequestParam(value = "name", required = false) String name,
+                                @ApiParam("排序字段") @RequestParam(value = "sortField", defaultValue = "create_date") String sortField,
+                                HttpServletRequest request) throws Exception{
+
+        Integer orgId = getOrgId(request);
+        IPage<TaShop> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaShop> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.like(!StringUtils.isEmpty(name), "shop_name", name);
+        queryWrapper.gt("status", CommConstant.STATUS_DELETE);
+        queryWrapper.orderByDesc(sortField);
+
+        IPage<TaShop> result = iTaShopService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param taShop 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/shop",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taShopAdd(@ApiParam("保存内容") @RequestBody TaShop taShop,
+                                  HttpServletRequest request) throws Exception{
+
+        Integer orgId = getOrgId(request);
+        taShop.setShopId(CommonUtils.getUUIDS());
+        taShop.setOrgId(orgId);
+        if (iTaShopService.save(taShop)){
+            return ResponseBean.success(taShop);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/admin/shop/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taShopDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTaShopService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taShop 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/shop/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taShopUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                     @ApiParam("更新内容") @RequestBody TaShop taShop) throws Exception{
+
+        taShop.setShopId(id);
+        if (iTaShopService.updateById(taShop)){
+            return ResponseBean.success(iTaShopService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/{client}/shop/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taShopGet(@ApiParam("客户端") @PathVariable String client,
+                                  @ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(iTaShopService.getById(id));
+    }
+}

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

@@ -0,0 +1,138 @@
+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.common.CommonUtils;
+import com.huiju.estateagents.common.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+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 com.huiju.estateagents.service.ITaShopTypeService;
+import com.huiju.estateagents.entity.TaShopType;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    * 商户分类  前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2020-11-03
+ */
+
+@Api(tags = "商户分类 ")
+@RestController
+@RequestMapping("/")
+public class TaShopTypeController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaShopTypeController.class);
+
+    @Autowired
+    public ITaShopTypeService iTaShopTypeService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/shop-type",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taShopTypeList(@ApiParam("客户端") @PathVariable String client,
+                                       @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @ApiParam("商铺名称") @RequestParam(value = "name", required = false) String name,
+                                       HttpServletRequest request) throws Exception{
+
+        Integer orgId = getOrgId(request);
+        IPage<TaShopType> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaShopType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.like(!StringUtils.isEmpty(name), "type_name", name);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaShopType> result = iTaShopTypeService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param taShopType 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/shop-type",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taShopTypeAdd(@ApiParam("保存内容") @RequestBody TaShopType taShopType,
+                                      HttpServletRequest request) throws Exception{
+
+        Integer orgId = getOrgId(request);
+        taShopType.setTypeId(CommonUtils.getUUIDS());
+        taShopType.setOrgId(orgId);
+        if (iTaShopTypeService.save(taShopType)){
+            return ResponseBean.success(taShopType);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/shop-type/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taShopTypeDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        TaShopType taShopType = iTaShopTypeService.getById(id);
+        taShopType.setStatus(CommConstant.STATUS_DELETE);
+        if(iTaShopTypeService.updateById(taShopType)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taShopType 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/shop-type/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taShopTypeUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                         @ApiParam("更新内容") @RequestBody TaShopType taShopType) throws Exception{
+
+        taShopType.setTypeId(id);
+        if (iTaShopTypeService.updateById(taShopType)){
+            return ResponseBean.success(iTaShopTypeService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/shop-type/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taShopTypeGet(@ApiParam("客户端") @PathVariable String client,
+                                      @ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(iTaShopTypeService.getById(id));
+    }
+}

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

@@ -3,7 +3,6 @@ package com.huiju.estateagents.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.wxpay.WXPayConstants;
 import com.huiju.estateagents.common.wxpay.WXPayUtil;
 import com.huiju.estateagents.entity.TaOrder;
@@ -12,25 +11,18 @@ import com.huiju.estateagents.service.ITaWxPayConfigService;
 import com.huiju.estateagents.service.IWxPayService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import sun.misc.BASE64Decoder;
-import sun.security.provider.MD5;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
 import javax.servlet.http.HttpServletRequest;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
-import java.security.Security;
 import java.util.Base64;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-import static sun.security.x509.CertificateAlgorithmId.ALGORITHM;
-
 @Slf4j
 @RestController
 @RequestMapping("/api")
@@ -149,7 +141,7 @@ public class WxPayController extends BaseController {
                 SecretKeySpec key = new SecretKeySpec(DigestUtils.md5Hex(mchKey).toLowerCase().getBytes(), "AES");
                 Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
                 cipher.init(Cipher.DECRYPT_MODE, key);
-                String req_info = new String(cipher.doFinal(new BASE64Decoder().decodeBuffer(resultMap.get("req_info"))), "UTF-8");
+                String req_info = new String(cipher.doFinal(Base64.getDecoder().decode(resultMap.get("req_info"))), "UTF-8");
                 log.info("req_info等于{}",req_info);
                 Map<String, String> orderInfo = WXPayUtil.xmlToMap(req_info);
                 wxPayService.houseRefund(orderInfo);

src/main/java/com/huiju/estateagents/eContract/controller/TaContractBusinessController.java

@@ -8,7 +8,6 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.eContract.entity.TaCompany;
-import com.huiju.estateagents.eContract.entity.TaCompanySeal;
 import com.huiju.estateagents.eContract.entity.TaContractBusiness;
 import com.huiju.estateagents.eContract.entity.TaContractTemplate;
 import com.huiju.estateagents.eContract.service.ITaCompanySealService;
@@ -17,17 +16,13 @@ import com.huiju.estateagents.eContract.service.ITaContractBusinessService;
 import com.huiju.estateagents.eContract.service.ITaContractTemplateService;
 import com.huiju.estateagents.entity.TaRaise;
 import com.huiju.estateagents.mapper.TaRaiseMapper;
-import com.huiju.estateagents.sample.entity.TaContact;
-import com.huiju.estateagents.service.ITaRaiseService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import sun.util.locale.LocaleObjectCache;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * <p>

src/main/java/com/huiju/estateagents/entity/TaShop.java

@@ -0,0 +1,93 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 商户 
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-11-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaShop implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 商户ID
+     */
+    @TableId(value = "shop_id", type = IdType.INPUT)
+    private String shopId;
+
+    /**
+     * 商户名称
+     */
+    private String shopName;
+
+    /**
+     * 商户logo
+     */
+    private String shopLogo;
+
+    /**
+     * 商户简介
+     */
+    private String shopDesc;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 经纬度 经度,纬度
+     */
+    private String lngLat;
+
+    /**
+     * 商户管理员 来源ta_user
+     */
+    private Integer userId;
+
+    /**
+     * 打分 0-5分
+     */
+    private Integer score;
+
+    /**
+     * 标签 半角逗号连接
+     */
+    private String tags;
+
+    /**
+     * 排序
+     */
+    private Integer sortNo;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+
+}

src/main/java/com/huiju/estateagents/entity/TaShopType.java

@@ -0,0 +1,68 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 商户分类 
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-11-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaShopType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 类型ID
+     */
+    @TableId(value = "type_id", type = IdType.INPUT)
+    private String typeId;
+
+    /**
+     * 类型名称
+     */
+    private String typeName;
+
+    /**
+     * 描述
+     */
+    private String typeDesc;
+
+    /**
+     * 图标
+     */
+    private String thumb;
+
+    /**
+     * 排序
+     */
+    private Integer sortNo;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+
+}

src/main/java/com/huiju/estateagents/job/OrgOrderTimeJob.java

@@ -1,55 +0,0 @@
-package com.huiju.estateagents.job;//package com.huiju.estateagents.job;
-
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.huiju.estateagents.base.BaseController;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.DateUtils;
-import com.huiju.estateagents.redpack.entity.TaOrgOrder;
-import com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.time.LocalDateTime;
-
-/**
- * 订单相关操作
- */
-@Component
-@Configuration
-@EnableScheduling
-public class OrgOrderTimeJob extends BaseController {
-
-    private Logger logger = LoggerFactory.getLogger(OrgOrderTimeJob.class);
-
-    @Autowired
-    private TaOrgOrderMapper taOrgOrderMapper;
-
-    /**
-     * 处理过期订单
-     */
-    @Scheduled(cron = "0 0/5 * * * ?")
-    private void dealExpireOrder() {
-        logger.info("处理过期订单 定时任务开始");
-
-        try {
-            TaOrgOrder taOrgOrder = new TaOrgOrder();
-            taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_FAIL);
-
-            UpdateWrapper<TaOrgOrder> taOrgOrderUpdateWrapper = new UpdateWrapper<>();
-            taOrgOrderUpdateWrapper.eq("status", CommConstant.STATUS_NORMAL);
-            taOrgOrderUpdateWrapper.lt("expiry_date", DateUtils.localDateTimeToString(LocalDateTime.now()));
-            taOrgOrderUpdateWrapper.eq("trading_status",CommConstant.TRADING_STATUS_PROCESSING);
-            Integer result = taOrgOrderMapper.update(taOrgOrder, taOrgOrderUpdateWrapper);
-            logger.info("处理过期订单 共更新" + result + "条数据");
-        } catch (Exception e) {
-            logger.error("处理过期订单 异常", e);
-        }
-        logger.info("处理过期订单 定时任务结束");
-    }
-
-}

src/main/java/com/huiju/estateagents/mapper/TaShopMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.huiju.estateagents.entity.TaShop;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 商户  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-11-03
+ */
+@Mapper
+public interface TaShopMapper extends BaseMapper<TaShop> {
+
+}

src/main/java/com/huiju/estateagents/mapper/TaShopTypeMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.huiju.estateagents.entity.TaShopType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 商户分类  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-11-03
+ */
+@Mapper
+public interface TaShopTypeMapper extends BaseMapper<TaShopType> {
+
+}

src/main/java/com/huiju/estateagents/sample/controller/TaH5DemandController.java

@@ -21,9 +21,6 @@ import com.huiju.estateagents.sample.service.ITaH5DemandService;
 import com.huiju.estateagents.sample.service.ITaH5SampleService;
 import com.huiju.estateagents.sample.service.ITaSampleContactService;
 import com.huiju.estateagents.service.ITaOrgService;
-import org.apache.poi.ss.formula.functions.T;
-import org.omg.CORBA.INTERNAL;
-import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/huiju/estateagents/service/ITaShopService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.huiju.estateagents.entity.TaShop;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 商户  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-11-03
+ */
+public interface ITaShopService extends IService<TaShop> {
+
+}

src/main/java/com/huiju/estateagents/service/ITaShopTypeService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.huiju.estateagents.entity.TaShopType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 商户分类  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-11-03
+ */
+public interface ITaShopTypeService extends IService<TaShopType> {
+
+}

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

@@ -4,15 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.controller.TaMiniFormidsController;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
 import com.huiju.estateagents.entity.*;
@@ -24,12 +18,10 @@ import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.service.*;
-import com.sun.corba.se.spi.resolver.Resolver;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.Collections;
 import java.util.List;
 
 /**

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.huiju.estateagents.entity.TaShop;
+import com.huiju.estateagents.mapper.TaShopMapper;
+import com.huiju.estateagents.service.ITaShopService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商户  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-11-03
+ */
+@Service
+public class TaShopServiceImpl extends ServiceImpl<TaShopMapper, TaShop> implements ITaShopService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.huiju.estateagents.entity.TaShopType;
+import com.huiju.estateagents.mapper.TaShopTypeMapper;
+import com.huiju.estateagents.service.ITaShopTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商户分类  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-11-03
+ */
+@Service
+public class TaShopTypeServiceImpl extends ServiceImpl<TaShopTypeMapper, TaShopType> implements ITaShopTypeService {
+
+}

src/main/resources/application-blue.yml → src/main/resources/application-dev.yml

@@ -1,92 +1,92 @@
-server:
-  port: 8080
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: root
-    password: LUfZGvh7j1^qA*2c
-    url: jdbc:mysql://123.57.65.31:3306/estateagents_test?useUnicode=true&serverTimezone=GMT%2B8&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: wxd6f47a9bb3052175
-    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-  - name: notice
-    id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-    keywords: 4
-  - name: newCustomer
-    id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-    keywords: 4
-  - name: mainbiz
-    id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
-    keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://101.200.84.17:8081/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: 营销云
-
-  visitor:
-    code: "0501"
-
-# 支付回调
-pay-notify: https://dev.fangdeal.cn/api/notify/
-#退款回调
-pay-refund: https://dev.fangdeal.cn/api/refund/
-
-#法大大服务器地址
-fadada:
-  appId: "403057"
-  appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
-  version: "2.0"
-  authServeHost: "http://test.api.fabigbig.com:8888/api/"
-  serveHost: "https://testapi08.fadada.com/api/"
-  companyNotify: "https://dev.fangdeal.cn/api/fadd/company"
-  authReturnUrl: "https://dev.fangdeal.cn/channel/#/eContract/seal/detail?id="
-  authNotifyUrl: "https://dev.fangdeal.cn/api/fadd/autoAuthCompanySeal"
-  signNotify: "https://dev.fangdeal.cn/api/fadd/sign"
-  redirectUrl: "https://dev.fangdeal.cn/other/redirect.html"
+server:
+  port: 8080
+spring:
+  application:
+    name: zhiyun
+  datasource:
+    username: zhiyun
+    password: Hf93UeZ4v44BBQTc
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/zhiyun?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: wxd6f47a9bb3052175
+    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
+    token:
+    aesKey:
+    msgDataFormat: JSON
+  tpls:
+  - name: notice
+    id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
+    keywords: 4
+  - name: newCustomer
+    id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
+    keywords: 4
+  - name: mainbiz
+    id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
+    keywords: 6
+ali:
+  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
+  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
+  oss:
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    bucketName: njcj
+    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
+
+# 手机短信服务
+sms:
+  url: http://101.200.84.17:8081/sms
+  method: POST
+  contentType: "application/json;charset=UTF-8"
+  template:
+    code:
+    tel:
+    params:
+
+  # 以下为各模板 code
+  # 验证码
+  captcha:
+    # 模板 code
+    code: "0301"
+    # 有效时间 秒
+    expire: 120
+    # 验证码长度
+    size: 4
+    # 短信签名
+    sign: 营销云
+
+  visitor:
+    code: "0501"
+
+# 支付回调
+pay-notify: https://dev.fangdeal.cn/api/notify/
+#退款回调
+pay-refund: https://dev.fangdeal.cn/api/refund/
+
+#法大大服务器地址
+fadada:
+  appId: "403057"
+  appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
+  version: "2.0"
+  authServeHost: "http://test.api.fabigbig.com:8888/api/"
+  serveHost: "https://testapi08.fadada.com/api/"
+  companyNotify: "https://dev.fangdeal.cn/api/fadd/company"
+  authReturnUrl: "https://dev.fangdeal.cn/channel/#/eContract/seal/detail?id="
+  authNotifyUrl: "https://dev.fangdeal.cn/api/fadd/autoAuthCompanySeal"
+  signNotify: "https://dev.fangdeal.cn/api/fadd/sign"
+  redirectUrl: "https://dev.fangdeal.cn/other/redirect.html"

src/main/resources/application-green.yml

@@ -1,92 +0,0 @@
-server:
-  port: 8086
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: root
-    password: LUfZGvh7j1^qA*2c
-    url: jdbc:mysql://123.57.65.31:3306/estateagents_test?useUnicode=true&serverTimezone=GMT%2B8&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: wxd6f47a9bb3052175
-    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-  - name: notice
-    id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-    keywords: 4
-  - name: newCustomer
-    id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-    keywords: 4
-  - name: mainbiz
-    id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
-    keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  url: http://101.200.84.17:8081/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: 营销云
-
-  visitor:
-    code: "0501"
-
-# 支付回调
-pay-notify: https://dev.fangdeal.cn/api/notify/
-#退款回调
-pay-refund: https://dev.fangdeal.cn/api/refund/
-
-#法大大服务器地址
-fadada:
-  appId: "403057"
-  appSecret: "xcIaK36Vc09yXXRdinXYcXhW"
-  version: "2.0"
-  authServeHost: "http://test.api.fabigbig.com:8888/api/"
-  serveHost: "https://testapi08.fadada.com/api/"
-  companyNotify: "https://dev.fangdeal.cn/api/fadd/company"
-  authReturnUrl: "https://dev.fangdeal.cn/channel/#/eContract/seal/detail?id="
-  authNotifyUrl: "https://dev.fangdeal.cn/api/fadd/autoAuthCompanySeal"
-  signNotify: "https://dev.fangdeal.cn/api/fadd/sign"
-  redirectUrl: "https://dev.fangdeal.cn/other/redirect.html"

src/main/resources/application-prod-green.yml

@@ -1,97 +0,0 @@
-server:
-  port: 9567
-spring:
-  application:
-    name: estateagents
-  datasource:
-    username: root
-    password: HZjVK5O%zTdP0#8AhGcF@03!eZsGbqdO
-    url: jdbc:mysql://rm-2zez52se79qgg9649po.mysql.rds.aliyuncs.com:3306/estateagents?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:
-    call-setters-on-nulls: true
-  mapper-locations: classpath:mapper/**/*.xml
-wx:
-  miniapp:
-    appid: wxd6f47a9bb3052175
-    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
-    token:
-    aesKey:
-    msgDataFormat: JSON
-  tpls:
-    - name: notice
-      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
-      keywords: 6
-ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
-  oss:
-    endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
-
-# 手机短信服务
-sms:
-  # 先使用外网地址, 后期使用内网地址
-  url: http://101.200.84.17:8081/sms
-  method: POST
-  contentType: "application/json;charset=UTF-8"
-  template:
-    code:
-    tel:
-    params:
-
-  # 以下为各模板 code
-  # 验证码
-  captcha:
-    # 模板 code
-    code: "0301"
-    # 有效时间 秒
-    expire: 120
-    # 验证码长度
-    size: 4
-    # 短信签名
-    sign: 橙蕉
-
-  visitor:
-    code: "0501"
-
-#日志配置
-logging:
-  config: classpath:log/logback-spring.xml
-  debug: true
-
-# 支付回调
-pay-notify: https://wx.fangdeal.cn/api/notify/
-#退款回调
-pay-refund: https://wx.fangdeal.cn/api/refund/
-
-#法大大服务器地址
-fadada:
-  appId: "500261"
-  appSecret: "go9yihmg7abS2lIBZpZ2yLSW"
-  version: "2.0"
-  authServeHost: "https://textapi.fadada.com/api2/"
-  serveHost: "https://textapi.fadada.com/api2/"
-  companyNotify: "https://wx.fangdeal.cn/api/fadd/company"
-  authReturnUrl: "http://admin.fangdeal.cn/#/eContract/seal/detail?id="
-  authNotifyUrl: "https://wx.fangdeal.cn/api/fadd/autoAuthCompanySeal"
-  signNotify: "https://wx.fangdeal.cn/api/fadd/sign"
-  redirectUrl: "https://wx.fangdeal.cn/other/redirect.html"

src/main/resources/application-prod-blue.yml → src/main/resources/application-prod.yml

@@ -2,11 +2,11 @@ server:
   port: 8567
 spring:
   application:
-    name: estateagents
+    name: zhiyun
   datasource:
-    username: root
-    password: HZjVK5O%zTdP0#8AhGcF@03!eZsGbqdO
-    url: jdbc:mysql://rm-2zez52se79qgg9649po.mysql.rds.aliyuncs.com:3306/estateagents?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    username: zhiyun
+    password: Hf93UeZ4v44BBQTc
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/zhiyun?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 # 最大连接数
@@ -40,12 +40,12 @@ wx:
       id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
       keywords: 6
 ali:
-  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
-  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
+  accessKeyId: LTAIGQtIi28MfXms
+  accessKeySecret: b6maakcdzEywmkhcK15rStx54hOiIA
   oss:
     endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: njcj
-    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
+    bucketName: zhiyun-image
+    bucketURL: https://zhiyun-image.oss-accelerate.aliyuncs.com
 
 # 手机短信服务
 sms:

src/main/resources/mapper/TaShopMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaShopMapper">
+
+</mapper>

src/main/resources/mapper/TaShopTypeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaShopTypeMapper">
+
+</mapper>

src/test/java/com/huiju/estateagents/WxPayTest.java

@@ -1,38 +0,0 @@
-package com.huiju.estateagents;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Random;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@Transactional
-public class WxPayTest {
-
-    @Test
-    public void getLocationCity() {
-//        try {
-//            String abc = "<xml><return_code>SUCCESS</return_code><appid><![CDATA[wxbbb069a341055ef0]]></appid><mch_id><![CDATA[1577983541]]></mch_id><nonce_str><![CDATA[3d8740137b51c5980b2048a105beb708]]></nonce_str><req_info><![CDATA[5RjGrqrAbzRvah2pEMp1QjCQavhY16xZhke159cIIap/UlJqUj0HSpFHGhlxp03Spbhb5I7WFdUqUErX8NOF7Wp4B/t06xYDvu+/KOVVtjHxvHijGfRIn9LTXPdDqJePFg/ZeYbZUYSUoqHygMSw8O+itBnlipxxh+bUPuTZro1/ydaiTC7gCcKTLkT1Njx6ctrPUC+IcukGVOzpnHy4tSfrt8mMpeGGrKVnmTDZxPBVbfGFebkir32wU4JfBpbpGmS0HDS8i8uq1qW8hnrDufIdcqzio7uMeM/ClTU5jy2Ez4SA7Ks21iObx0gNXMfnEDBKYJsw58R3V7aSf8VS2gWTSn/2QFxmzrSoMH3/bBKvY+LfOsSkis+ZvnMd4baYrRoIzGUkfmE2QXxzupN4404folIyuJ2xB1ewLRK7BTU6MRjPhg9jcEIAVWyoTp04Alek3xLzMILvMzGr0tOdIIqXYKs+7FAcuXgiqpvyw6yVF1l3Xj/IorXLSpfeFqycUUTr4uH7Rm8eCdFDt6YTSVaMRLWNWUBTC8BW4JlpimuXYYMeqrjY0MaJceiN5ZHoIGFmqnml/Tpzcwyb2j6tk5oaEIHlYVAJmsFmL6RLTPFDlUTOOEFAnZ1+wUqxSO0Z6cwcZgIioL1OPS2DC5c2Vi/FEgt8vu1HMn2wClH+R9kDu3fx9TqP8sfG1W89TQP1/s+oQvNdtFJKacGCVeSJ5Fc4pF1zRCStOGOoIAtEf7ub7VitKelYuABPc8P0dzgoLsBPUwFgrx+QrDMzyp8zICK8bzIqqFp+x+1RSN5Q7i8gvh4vWKuajST3F74L+zkQ9r2pEaZ/zWIUHx+xWDb8nw9hMlR4oER+ITASgsqP1PAFpRrHNFl3kV6p5V9Cp5LEVfch+yCS1f/cfcY3KiY4KYBB2jNe+nr/cq5Aq1ijujNERBpjDzJaaJiVcPBKSkcAwk0wPTqYk4ihDlUQ8XTgrfEKje1acdKiA3/t4ltHdG0vGVTKXwteHdnRggBUwELzQFLrPpbx1M2lxBlc8zkm08WLP+DW+rx09ZcyQMCBTFk=]]></req_info></xml>";
-//            Map resultMap = WXPayUtil.xmlToMap(abc);
-//            SecretKeySpec key = new SecretKeySpec(DigestUtils.md5Hex("RGiWajOfaw3Zl7TUIoQNjmEKA8VG8ZNL").toLowerCase().getBytes(), "AES");
-//            Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
-//            cipher.init(Cipher.DECRYPT_MODE, key);
-//            String req_info = new String(cipher.doFinal(new BASE64Decoder().decodeBuffer(resultMap.get("req_info").toString())), "UTF-8");
-//
-//            Map<String, String> orderInfo = WXPayUtil.xmlToMap(req_info);
-//            System.out.println(orderInfo);
-//        }catch (Exception e) {
-//            e.printStackTrace();
-//        }
-        Random random = new Random();
-        for (int i =0; i <100 ; i++){
-            System.out.println(random.nextInt(5)%(5-1 + 1) +1);
-        }
-
-
-    }
-}