fix

pom.xml

@@ -33,6 +33,8 @@
         <servlet-api.version>3.1.0</servlet-api.version>
 
         <plugin.compiler.version>3.7.0</plugin.compiler.version>
+
+        <skipTests>true</skipTests>
     </properties>
 
     <!--依赖-->
@@ -190,12 +192,12 @@
                 <version>1.10</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.qiniu</groupId>
-                <artifactId>qiniu-java-sdk</artifactId>
-                <version>7.2.11</version>
-                <scope>compile</scope>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>com.qiniu</groupId>-->
+                <!--<artifactId>qiniu-java-sdk</artifactId>-->
+                <!--<version>7.2.11</version>-->
+                <!--<scope>compile</scope>-->
+            <!--</dependency>-->
             <dependency>
                 <groupId>com.squareup.okhttp3</groupId>
                 <artifactId>okhttp</artifactId>
@@ -215,6 +217,29 @@
                 <scope>compile</scope>
             </dependency>
 
+
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <optional>true</optional>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.5</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>1.2.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.qiniu</groupId>
+                <artifactId>qiniu-java-sdk</artifactId>
+                <version>[7.2.0, 7.2.99]</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -231,7 +256,7 @@
                     <encoding>UTF-8</encoding>
                     <compilerArguments>
                         <verbose />
-                        <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar</bootclasspath>
+                        <bootclasspath>${java.home}/lib/rt.jar:${java.home}/lib/jce.jar</bootclasspath>
                     </compilerArguments>
                 </configuration>
             </plugin>

wjj-api/src/main/java/com/demo/wjj/controller/AgentController.java

@@ -1,7 +1,9 @@
 package com.demo.wjj.controller;
 
 import com.demo.wjj.po.Agent;
+import com.demo.wjj.po.DiggerAgent;
 import com.demo.wjj.service.AgentService;
+import com.demo.wjj.service.DiggerAgentService;
 import com.demo.wjj.utils.ApiResult;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -30,6 +32,9 @@ public class AgentController {
     @Autowired
     private AgentService agentService;
 
+    @Autowired
+    DiggerAgentService diggerAgentService;
+
     /**
      *  获取商家信息
      * @param agentId 商家id
@@ -61,4 +66,65 @@ public class AgentController {
             return ApiResult.createFailure();
         }
     }
+
+    @GetMapping("/getAgentInfo")
+    public ApiResult getAgentInfo(@RequestParam(required = false) String agentId) {
+        LOG.info("调用获取信息(/agent/getAgent)接口, agentId:{}", agentId);
+        if (StringUtils.isBlank(agentId)) {
+            LOG.info("agentId为空");
+            return ApiResult.createFailure();
+        }
+
+        try {
+            Agent agent = agentService.getAgent(agentId);
+
+            ApiResult<Agent> apiResult = ApiResult.createSuccess(agent);
+            LOG.info("调用获取商家信息(/agent/getAgent)接口成功, apiResult: {}", apiResult);
+            return apiResult;
+        } catch (Exception e) {
+            LOG.error("调用获取商家信息(/agent/getAgent)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+
+    /**
+     *  获取商家信息
+     * @param agentId 商家id
+     * @return apiResult
+     */
+    @GetMapping("/getAgentByOpenId")
+    public ApiResult getAgentByOpenId(@RequestParam(required = false) String agentId,@RequestParam(required = false) String openId) {
+        LOG.info("调用获取信息(/agent/getAgent)接口, agentId:{}, agentId:{}", agentId,openId);
+        if (StringUtils.isBlank(agentId)) {
+            LOG.info("agentId为空");
+            return ApiResult.createFailure();
+        }
+        if (StringUtils.isBlank(openId)) {
+            LOG.info("openId为空");
+            return ApiResult.createFailure();
+        }
+
+        try {
+            Agent agent = agentService.getAgent(agentId);
+            Map<String, Object> data = new HashMap<>();
+            if (agent != null) {
+                data.put("appId", agent.getAppId());
+                data.put("mchAppId", agent.getMchAppId());
+                data.put("shareTitle", agent.getShareTitle());
+                data.put("shareContent", agent.getShareContent());
+                data.put("logo", agent.getAgentLogo());
+            }
+            DiggerAgent diggerAgent=diggerAgentService.getDiggerAgentTop(agentId,openId);
+            if (diggerAgent != null) {
+                data.put("name", diggerAgent.getDaName());
+                data.put("mobile", diggerAgent.getDaPhone());
+            }
+            ApiResult<Map<String, Object>> apiResult = ApiResult.createSuccess(data);
+            LOG.info("调用获取商家信息(/agent/getAgent)接口成功, apiResult: {}", apiResult);
+            return apiResult;
+        } catch (Exception e) {
+            LOG.error("调用获取商家信息(/agent/getAgent)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
 }

wjj-api/src/main/java/com/demo/wjj/controller/AgreementController.java

@@ -0,0 +1,34 @@
+package com.demo.wjj.controller;
+
+import com.demo.wjj.service.AgreementService;
+import com.demo.wjj.utils.ApiResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("/agree")
+@RestController
+public class AgreementController {
+    private final Logger LOG = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private AgreementService agreementService;
+
+    @GetMapping("/getAgreement")
+    public ApiResult getAgreement() {
+        LOG.info("调用获取协议信息(/agree/getAgreement)接口");
+        try {
+            ApiResult apiResult = agreementService.getInfo();
+            LOG.info("apiResult="+apiResult);
+            LOG.info("调用获取协议信息(/agree/getAgreement)接口成功");
+            LOG.debug("调用获取协议信息(/agree/getAgreement), apiResult:{}", apiResult);
+            return apiResult;
+        } catch (Exception e) {
+            LOG.error("调用获取协议信息(/agree/getAgreement)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+}

wjj-api/src/main/java/com/demo/wjj/controller/CertificationController.java

@@ -0,0 +1,374 @@
+package com.demo.wjj.controller;
+
+import com.demo.wjj.po.Agent;
+import com.demo.wjj.po.UserInfo;
+import com.demo.wjj.service.*;
+import com.demo.wjj.utils.ApiResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.List;
+import org.apache.commons.lang3.StringUtils;
+@RequestMapping("/certification")
+@RestController
+public class CertificationController {
+    private final Logger LOG = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private CertificationService certificationService;
+
+    @Autowired
+    private AgentService agentService;
+
+    @Autowired
+    QiNiuService qiNiuService;
+
+
+
+    /**
+     * 判断是否实名认证
+     * @return apiResult
+     */
+    @GetMapping("/getUserInfo")
+    public ApiResult getUserInfo(String idCard,String status) {
+        LOG.info("调用获取用户信息(/certification/getUserInfo)接口");
+        try {
+            UserInfo userInfo = certificationService.getUserInfo(idCard,status);
+            if(userInfo!=null) {
+                if (StringUtils.isNotBlank(userInfo.getIdcarddfrontpic())) {
+                    String Idcarddfrontpic = qiNiuService.getUrl(userInfo.getIdcarddfrontpic());
+                    userInfo.setIdcarddfrontpic(Idcarddfrontpic);
+                }
+                if (StringUtils.isNotBlank(userInfo.getIdcarddbackpic())) {
+                    String Idcarddbackpic = qiNiuService.getUrl(userInfo.getIdcarddbackpic());
+                    userInfo.setIdcarddbackpic(Idcarddbackpic);
+                }
+                if (StringUtils.isNotBlank(userInfo.getPic())) {
+                    String pic = qiNiuService.getUrl(userInfo.getPic());
+                    userInfo.setPic(pic);
+                }
+                if (StringUtils.isNotBlank(userInfo.getBankcardpic())) {
+                    String bankcardpic = qiNiuService.getUrl(userInfo.getBankcardpic());
+                    userInfo.setBankcardpic(bankcardpic);
+                }
+            }
+            LOG.info("userInfo="+userInfo);
+            ApiResult<UserInfo> apiResult = ApiResult.createSuccess(userInfo);
+            LOG.info("调用获取用户信息(/certification/getUserInfo)接口成功");
+            LOG.debug("调用获取用户信息(/certification/getUserInfo), apiResult:{}", apiResult);
+            return apiResult;
+        } catch (Exception e) {
+            LOG.error("调用获取用户信息(/certification/getUserInfo)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+    @GetMapping("/getUserInfoByAgent")
+    public ApiResult getUserInfoByAgent(String status,String angentId) {
+        LOG.info("调用获取用户信息(/certification/getUserInfo)接口");
+        try {
+            List<UserInfo> userInfos = certificationService.getUserInfoByAgent(status,angentId);
+            for(UserInfo userInfo:userInfos) {
+                if (userInfo != null) {
+                    if (StringUtils.isNotBlank(userInfo.getIdcarddfrontpic())) {
+                        String Idcarddfrontpic = qiNiuService.getUrl(userInfo.getIdcarddfrontpic());
+                        userInfo.setIdcarddfrontpic(Idcarddfrontpic);
+                    }
+                    if (StringUtils.isNotBlank(userInfo.getIdcarddbackpic())) {
+                        String Idcarddbackpic = qiNiuService.getUrl(userInfo.getIdcarddbackpic());
+                        userInfo.setIdcarddbackpic(Idcarddbackpic);
+                    }
+                    if (StringUtils.isNotBlank(userInfo.getPic())) {
+                        String pic = qiNiuService.getUrl(userInfo.getPic());
+                        userInfo.setPic(pic);
+                    }
+                    if (StringUtils.isNotBlank(userInfo.getBankcardpic())) {
+                        String bankcardpic = qiNiuService.getUrl(userInfo.getBankcardpic());
+                        userInfo.setBankcardpic(bankcardpic);
+                    }
+                }
+            }
+            ApiResult<List<UserInfo>> apiResult = ApiResult.createSuccess(userInfos);
+            LOG.info("调用获取用户信息(/certification/getUserInfo)接口成功");
+            LOG.debug("调用获取用户信息(/certification/getUserInfo), apiResult:{}", apiResult);
+            return apiResult;
+        } catch (Exception e) {
+            LOG.error("调用获取用户信息(/certification/getUserInfo)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+
+    @GetMapping("/getUserInfoByAgentAndOpenId")
+    public ApiResult getUserInfoByAgentAndOpenId(String status,String angentId,String openId) {
+        LOG.info("调用获取用户信息(/certification/getUserInfo)接口");
+        try {
+            UserInfo userInfo = certificationService.getUserInfoByAgentAndOpenId(status,angentId,openId);
+
+            if (userInfo != null) {
+                if (StringUtils.isNotBlank(userInfo.getIdcarddfrontpic())) {
+                    String Idcarddfrontpic = qiNiuService.getUrl(userInfo.getIdcarddfrontpic());
+                    userInfo.setIdcarddfrontpic(Idcarddfrontpic);
+                }
+                if (StringUtils.isNotBlank(userInfo.getIdcarddbackpic())) {
+                    String Idcarddbackpic = qiNiuService.getUrl(userInfo.getIdcarddbackpic());
+                    userInfo.setIdcarddbackpic(Idcarddbackpic);
+                }
+                if (StringUtils.isNotBlank(userInfo.getPic())) {
+                    String pic = qiNiuService.getUrl(userInfo.getPic());
+                    userInfo.setPic(pic);
+                }
+                if (StringUtils.isNotBlank(userInfo.getBankcardpic())) {
+                    String bankcardpic = qiNiuService.getUrl(userInfo.getBankcardpic());
+                    userInfo.setBankcardpic(bankcardpic);
+                }
+            }
+            ApiResult<UserInfo> apiResult = ApiResult.createSuccess(userInfo);
+            LOG.info("调用获取用户信息(/certification/getUserInfo)接口成功");
+            LOG.debug("调用获取用户信息(/certification/getUserInfo), apiResult:{}", apiResult);
+            return apiResult;
+        } catch (Exception e) {
+            LOG.error("调用获取用户信息(/certification/getUserInfo)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+
+    /**,
+     * 四要素验证
+     *
+     */
+    @PostMapping("/userVerification")
+    public ApiResult userVerification(String name,
+                                      String sex,
+                                      String idCard,
+                                      String birthday,
+                                      String province,
+                                      String city,
+                                      String prefecture,
+                                      String area,
+                                      String addrCode,
+                                      String accountNo,
+                                      String mobile,
+                                      String bank,
+                                      String cardName,
+                                      String cardType,
+                                      String openId,
+                                      String idCardDFrontPic,
+                                      String idCardDBackPic,
+                                      String cardValidity,
+                                      String bankCardPic,
+                                      String role,
+                                      String pic,
+                                      String agentId,
+                                      String url,
+                                      String verifyOpenId,
+                                      String appId){
+        UserInfo userInfo=new UserInfo();
+        userInfo.setUsername(name);
+        userInfo.setSex(sex);
+        userInfo.setIdcard(idCard);
+        userInfo.setBirthday(birthday);
+        userInfo.setProvince(province);
+        userInfo.setCity(city);
+        userInfo.setPrefecture(prefecture);
+        userInfo.setArea(area);
+        userInfo.setAddrcode(addrCode);
+        userInfo.setAccountno(accountNo);
+        userInfo.setMobile(mobile);
+        userInfo.setBank(bank);
+        userInfo.setCardname(cardName);
+        userInfo.setCardtype(cardType);
+        userInfo.setUseropenid(openId);
+        userInfo.setIdcarddfrontpic(idCardDFrontPic);
+        userInfo.setIdcarddbackpic(idCardDBackPic);
+        userInfo.setCardvalidity(cardValidity);
+        userInfo.setRole(role);
+        userInfo.setPic(pic);
+        userInfo.setBankcardpic(bankCardPic);
+        LOG.info("userInfo==="+userInfo);
+        final Agent agent = agentService.getAgent(agentId);
+        LOG.info("url==="+url);
+        if (agent == null) {
+            final ApiResult apiResult = ApiResult.createFailure();
+            apiResult.setMessage("未查询到商家信息");
+            return apiResult;
+        }
+        LOG.info("调用四要素验证(/userVerification/getUserVerification)接口");
+        LOG.info("url=="+url);
+        url=url+"?idCard="+userInfo.getIdcard()+"&agentId="+agentId+"&openId="+userInfo.getUseropenid();
+        try {
+            ApiResult res = certificationService.getUserVerifycation(
+                    userInfo,
+                    agent,
+                    url,
+                    verifyOpenId,
+                    appId);
+
+            LOG.info("调用四要素验证(/userVerification/getUserVerification)接口成功");
+            LOG.debug("调用四要素验证(/userVerification/getUserVerification), apiResult:{}", res);
+            return res;
+        } catch (Exception e) {
+            LOG.error("调用四要素验证(/certification/getUserInfo)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+
+    /**
+     * 身份证识别
+     * FRONT：身份证含照片的一面；BACK：身份证带国徽的一面
+     */
+    @PostMapping("/idCardVerification")
+    public ApiResult idCardVerification(String url,String img){
+        LOG.info("调用身份证识别(/userVerification/idCardVerification)接口");
+        try {
+            //获取骑牛上传的url地址
+            String path=qiNiuService.getUrl(url);
+            ApiResult res = certificationService.checkIdCardVerification(path, img);
+            LOG.info("调用身份证识别(/userVerification/idCardVerification)接口成功");
+            LOG.debug("调用身份证识别(/certification/idCardVerification), apiResult:{}", res);
+            return res;
+        } catch (Exception e) {
+            LOG.error("调用身份证识别(/certification/idCardVerification)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+
+    /**
+     * 银行卡识别
+     *
+     */
+    @PostMapping("/bankCardVerification")
+    public ApiResult bankCardVerification(String url){
+        LOG.info("调用银行卡识别(/userVerification/bankCardVerification)接口");
+        try {
+            //获取骑牛上传的url地址
+            String path=qiNiuService.getUrl(url);
+            ApiResult res = certificationService.bankCardVerification(path);
+            LOG.info("调用银行卡识别(/userVerification/bankCardVerification)接口成功");
+            LOG.debug("调用银行卡识别(/certification/bankCardVerification), apiResult:{}", res);
+            return res;
+        } catch (Exception e) {
+            LOG.error("调用银行卡识别(/certification/bankCardVerification)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+
+
+    /**
+     * 实名认证说明
+     * @return apiResult
+     */
+    @GetMapping("/getExplain")
+    public ApiResult getExplain(String idCard) {
+        LOG.info("调用实名认证说明(/certification/getExplain)接口");
+        try {
+            ApiResult info = certificationService.getExplainInfo();
+            LOG.info("调用实名认证说明(/certification/getExplain)接口成功");
+            LOG.debug("调用实名认证说明(/certification/getExplain), apiResult:{}", info);
+            return info;
+        } catch (Exception e) {
+            LOG.error("调用实名认证说明(/certification/getExplain)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+
+    /**
+     * 保存实名认证信息
+     * @return apiResult
+     */
+    @PostMapping("/saveUserInfo")
+    public ApiResult saveUserInfo(String userName,
+                                String sex,
+                                String idcard,
+                                String birthday,
+                                String province,
+                                String city,
+                                String prefecture,
+                                String area,
+                                String addrCode,
+                                String account_no,
+                                String phone_no,
+                                String bank,
+                                String cardName,
+                                String cardType,
+                                String status,
+                                String openId,
+                                String idCardDFrontPic,
+                                String idCardDBackPic,
+                                String cardValidity,
+                                String role,
+                                String pic) {
+        LOG.info("调用保存实名认证信息(/certification/saveUserInfo)接口");
+        UserInfo info=new UserInfo();
+        info.setUsername(userName);
+        info.setSex(sex);
+        info.setIdcard(idcard);
+        info.setBirthday(birthday);
+        info.setProvince(province);
+        info.setCity(city);
+        info.setPrefecture(prefecture);
+        info.setArea(area);
+        info.setAddrcode(addrCode);
+        info.setAccountno(account_no);
+        info.setMobile(phone_no);
+        info.setBank(bank);
+        info.setCardname(cardName);
+        info.setCardtype(cardType);
+        info.setStatus(status);
+        info.setUseropenid(openId);
+        info.setIdcarddfrontpic(idCardDFrontPic);
+        info.setIdcarddbackpic(idCardDBackPic);
+        info.setCardvalidity(cardValidity);
+        info.setRole(role);
+        info.setPic(pic);
+        try {
+            ApiResult apiResult = certificationService.saveUserInfo(info);
+            LOG.info("apiResult="+apiResult);
+            LOG.info("调用保存实名认证信息(/certification/saveUserInfo)接口成功");
+            LOG.debug("调用保存实名认证信息(/certification/saveUserInfo), apiResult:{}", apiResult);
+            return apiResult;
+        } catch (Exception e) {
+            LOG.error("调用保存实名认证信息(/certification/saveUserInfo)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+
+    /**
+     * 查询实名认证列表
+     * 1:待审核 2：实名认证通过
+     */
+    @GetMapping("/getUserVerificationList")
+    public ApiResult getUserVerificationList(String status){
+        ApiResult apiResult = certificationService.getUserVerificationList(status);
+        LOG.info("apiResult="+apiResult);
+        return apiResult;
+    }
+
+    /**
+     * 审核消息模板推送 status：1-通过 2-不通过
+     */
+    @GetMapping("/sendTempMsg")
+    public ApiResult sendTempMsg(String status,String reviewComments,String openId,String idCard,String agentId,String appId){
+        final Agent agent = agentService.getAgent(agentId);
+        LOG.info("agent==="+agent);
+        if (agent == null) {
+            final ApiResult apiResult = ApiResult.createFailure();
+            apiResult.setMessage("未查询到商家信息");
+            return apiResult;
+        }
+        String str = null;
+        LOG.info("reviewComments==="+reviewComments);
+        try {
+            str = new String (reviewComments.getBytes("ISO8859-1"),"utf-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        LOG.info("reviewComments==="+str);
+        ApiResult apiResult = certificationService.sendUserVerification(openId,str, status, agent, idCard, appId);
+        LOG.info("apiResult="+apiResult);
+        return apiResult;
+    }
+}

wjj-api/src/main/java/com/demo/wjj/controller/DisplaceController.java

@@ -5,19 +5,19 @@ import com.demo.wjj.bo.DisplaceListBo;
 import com.demo.wjj.bo.ImgListBo;
 import com.demo.wjj.bo.SaveDisplaceBo;
 import com.demo.wjj.converter.SaveDisplaceConverter;
+import com.demo.wjj.po.DisplaceAudit;
 import com.demo.wjj.po.TbImgItem;
 import com.demo.wjj.qo.SaveDisplaceQo;
-import com.demo.wjj.service.DisplaceAuditService;
-import com.demo.wjj.service.DisplaceManage;
-import com.demo.wjj.service.TbImgItemService;
-import com.demo.wjj.service.TbImgListService;
+import com.demo.wjj.service.*;
 import com.demo.wjj.utils.ApiResult;
 import com.demo.wjj.utils.ExecuteResult;
 import com.demo.wjj.utils.PageBean;
 import com.demo.wjj.utils.Result;
 import com.demo.wjj.validator.SaveDisplaceQoValidator;
 import com.github.pagehelper.PageInfo;
+import com.qiniu.processing.OperationStatus;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -61,6 +62,9 @@ public class DisplaceController {
     @Autowired
     private TbImgListService tbImgListService;
 
+    @Autowired
+    QiNiuService qiNiuService;
+
     @InitBinder
     protected void initBinder(WebDataBinder binder) {
         Object target = binder.getTarget();
@@ -77,6 +81,8 @@ public class DisplaceController {
      * 保存置换
      *
      * @param saveDisplaceQo 置换参数
+     * private String is_good;//1-普通2-精品
+     * private String storage;//1-完成；2-暂存
      * @return apiResult
      */
     @PostMapping("/save")
@@ -87,7 +93,7 @@ public class DisplaceController {
             LOG.warn("请求参数错误");
             return ApiResult.createFailure();
         }
-
+        final String[] pictureSubfixs = {".BMP", ".JPG", ".JPEG", ".PNG", ".GIF", ".bmp", ".jpg", ".jpeg", ".png", ".gif"};
         try {
             SaveDisplaceBo convert = saveDisplaceConverter.convert(saveDisplaceQo);
 
@@ -96,6 +102,23 @@ public class DisplaceController {
 
             //便利图片数组 给予分类存储
             for (SaveDisplaceBo.DisplaceImageList displaceImage : displaceImageLists) {
+                List<String> picList = new ArrayList<>();
+                //转码
+                for(String key:displaceImage.getPic()){
+                    String keyModel=key;
+                    String subfix = key.substring(key.lastIndexOf("."));
+                    if (!ArrayUtils.contains(pictureSubfixs, subfix)){
+                        OperationStatus operationStatus=qiNiuService.persisted(key);
+                        LOG.info("operationStatus======"+operationStatus);
+                        LOG.info("operationStatus======"+operationStatus.inputKey);
+                        keyModel="weigongcheng_"+key;
+                        LOG.info("keyModel======"+keyModel);
+                    }
+                    picList.add(keyModel);
+                    LOG.info("picList======"+picList);
+                }
+                displaceImage.setPic(null);
+                displaceImage.setPic(picList);
                 //获取细节分类id
                 Integer detailId = displaceImage.getDetailId();
                 //detail袭击目录不等于空
@@ -280,4 +303,159 @@ public class DisplaceController {
             return ApiResult.createFailure();
         }
     }
+
+    /**
+     * 根据类型查询精品设备
+     *
+     * @param type 1-在售设备”、“2停售设备”、“3成交设备”、“4我的秒杀
+     * @return apiResult
+     */
+    @GetMapping("/getDisplaceGoodBuyList")
+    public ApiResult getDisplaceGoodBuyList(@RequestParam(required = false) String type,@RequestParam(required = false) String agentId, @RequestParam(required = false) String openId, HttpServletRequest request){
+        LOG.info("根据类型查询设备列表(/displace/getDisplaceList)接口, agentId:{}, openId:{}, type:{}", agentId, openId, type);
+
+        if (StringUtils.isBlank(agentId)) {
+            LOG.info("agentId为空");
+            return ApiResult.createFailure();
+        }
+
+        if (StringUtils.isBlank(openId)) {
+            LOG.info("微信openId为空");
+            return ApiResult.createFailure();
+        }
+
+        try {
+            PageInfo<DisplaceListBo> pageInfo = displaceAuditService.queryTypeDisplaceList(agentId, openId, type, PageBean.create(request));
+            ApiResult<PageInfo<DisplaceListBo>> apiResult = ApiResult.createSuccess(pageInfo);
+            LOG.info("根据类型查询设备列表(/displace/getDisplaceList)接口成功");
+            LOG.debug("置换列表, apiResult:{}", apiResult);
+            return apiResult;
+        } catch (Exception e) {
+            LOG.error("根据类型查询设备列表(/displace/getDisplaceList)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+
+    /**
+     * 根据类型查询我要卖精品设备
+     *
+     *
+     * @return apiResult
+     */
+    @GetMapping("/getDisplaceGoodSaleList")
+    public ApiResult getDisplaceGoodSaleList(@RequestParam(required = false) String agentId,
+                                             @RequestParam(required = false) String openId,
+                                             HttpServletRequest request){
+        LOG.info("根据类型查询设备列表(/displace/getDisplaceList)接口, agentId:{}, openId:{}", agentId, openId);
+
+        if (StringUtils.isBlank(agentId)) {
+            LOG.info("agentId为空");
+            return ApiResult.createFailure();
+        }
+
+        if (StringUtils.isBlank(openId)) {
+            LOG.info("微信openId为空");
+            return ApiResult.createFailure();
+        }
+
+        try {
+            PageInfo<DisplaceListBo> pageInfo = displaceAuditService.getDisplaceGoodSaleList(agentId, openId, PageBean.create(request));
+            ApiResult<PageInfo<DisplaceListBo>> apiResult = ApiResult.createSuccess(pageInfo);
+            LOG.info("根据类型查询设备列表(/displace/getDisplaceList)接口成功");
+            LOG.debug("置换列表, apiResult:{}", apiResult);
+            return apiResult;
+        } catch (Exception e) {
+            LOG.error("根据类型查询设备列表(/displace/getDisplaceList)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+
+    /**
+     * 用户报价与保留价比较
+     */
+    @GetMapping("/judge")
+    public ApiResult judge(@RequestParam(required = false) String displaceId){
+        if (StringUtils.isBlank(displaceId)) {
+            LOG.info("displaceId为空");
+            return ApiResult.createFailure();
+        }
+
+        try {
+            DisplaceAudit displaceAudit = displaceAuditService.getDisplaceAudit(displaceId);
+            ApiResult<DisplaceAudit> apiResult = ApiResult.createSuccess(displaceAudit);
+            LOG.info("根据置换id用户报价与保留价比较(/displace/judge)接口成功");
+            LOG.debug("置换列表, apiResult:{}", apiResult);
+            return apiResult;
+        } catch (Exception e) {
+            LOG.error("根据置换id用户报价与保留价比较(/displace/judge)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+
+    /**
+     * 查询暂存列表
+     *
+     *
+     * @return apiResult
+     */
+    @GetMapping("/getDisplaceStorageList")
+    public ApiResult getDisplaceStorageList(@RequestParam(required = false) String storageStatus,
+                                            @RequestParam(required = false) String agentId,
+                                            @RequestParam(required = false) String openId,
+                                            HttpServletRequest request){
+        LOG.info("查询暂存列表(/displace/getDisplaceStorageList)接口, agentId:{}, openId:{}", agentId, openId);
+
+        if (StringUtils.isBlank(agentId)) {
+            LOG.info("agentId为空");
+            return ApiResult.createFailure();
+        }
+
+        if (StringUtils.isBlank(openId)) {
+            LOG.info("微信openId为空");
+            return ApiResult.createFailure();
+        }
+
+        try {
+            PageInfo<DisplaceListBo> pageInfo = displaceAuditService.getDisplaceStorageList(agentId, openId,storageStatus, PageBean.create(request));
+            ApiResult<PageInfo<DisplaceListBo>> apiResult = ApiResult.createSuccess(pageInfo);
+            LOG.info("查询暂存列表(/displace/getDisplaceStorageList)接口成功");
+            LOG.debug("置换列表, apiResult:{}", apiResult);
+            return apiResult;
+        } catch (Exception e) {
+            LOG.error("查询暂存列表(/displace/getDisplaceStorageList)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+
+    /**
+     * 查询待确认置换列表
+     *
+     */
+    @GetMapping("/getDisplaceConfirmList")
+    public ApiResult getDisplaceConfirmList(@RequestParam(required = false) String agentId,
+                                            @RequestParam(required = false) String openId,
+                                            HttpServletRequest request){
+        LOG.info("查询暂存列表(/displace/getDisplaceStorageList)接口, agentId:{}, openId:{}", agentId, openId);
+
+        if (StringUtils.isBlank(agentId)) {
+            LOG.info("agentId为空");
+            return ApiResult.createFailure();
+        }
+
+        if (StringUtils.isBlank(openId)) {
+            LOG.info("微信openId为空");
+            return ApiResult.createFailure();
+        }
+
+        try {
+            PageInfo<DisplaceListBo> pageInfo = displaceAuditService.getDisplaceConfirmList(agentId, openId, PageBean.create(request));
+            ApiResult<PageInfo<DisplaceListBo>> apiResult = ApiResult.createSuccess(pageInfo);
+            LOG.info("查询暂存列表(/displace/getDisplaceStorageList)接口成功");
+            LOG.debug("置换列表, apiResult:{}", apiResult);
+            return apiResult;
+        } catch (Exception e) {
+            LOG.error("查询暂存列表(/displace/getDisplaceStorageList)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
 }

wjj-api/src/main/java/com/demo/wjj/controller/PlaybillController.java

@@ -0,0 +1,38 @@
+package com.demo.wjj.controller;
+
+import com.demo.wjj.po.Playbill;
+import com.demo.wjj.service.PlaybillService;
+import com.demo.wjj.utils.ApiResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@RequestMapping("/playbill")
+@RestController
+public class PlaybillController {
+    private final Logger LOG = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private PlaybillService playbillService;
+
+    @GetMapping("/queryPlaybillList")
+    public ApiResult queryPlaybillList(HttpServletRequest request) {
+        LOG.info("调用获取海报列表(/playbill/queryPlaybillList)接口");
+
+        try {
+            ApiResult apiResult = playbillService.selectPlaybill();
+            LOG.info("调用获取海报列表(/playbill/queryPlaybillList)接口成功");
+            return apiResult;
+        } catch (Exception e) {
+            LOG.error("调用获取海报列表(/playbill/queryPlaybillList)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+
+}

wjj-api/src/main/java/com/demo/wjj/controller/ResourceController.java

@@ -1,7 +1,9 @@
 package com.demo.wjj.controller;
 
+import com.demo.wjj.service.QiNiuService;
 import com.demo.wjj.service.ResourceService;
 import com.demo.wjj.utils.ApiResult;
+import com.qiniu.processing.OperationStatus;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,6 +29,9 @@ public class ResourceController {
     @Autowired
     private ResourceService resourceService;
 
+    @Autowired
+    QiNiuService qiNiuService;
+
     @PostMapping("/upload")
     public ApiResult upload(@RequestParam(required = false) String agentId,
                             @RequestParam(required = false) String serverId,
@@ -50,7 +55,9 @@ public class ResourceController {
 
         try {
             final String resourceKey = resourceService.upload(agentId, openId, serverId);
+//            OperationStatus operationStatus=qiNiuService.persisted(resourceKey);
 
+//            LOG.info("调用七牛压缩资源接口成功, operationStatus:{}", operationStatus);
             ApiResult apiResult;
             if (StringUtils.isBlank(resourceKey)) {
                 apiResult = ApiResult.createFailure();

wjj-api/src/main/java/com/demo/wjj/controller/UserController.java

@@ -4,6 +4,7 @@ import com.demo.wjj.converter.UserRegisterConverter;
 import com.demo.wjj.qo.UserRegisterQo;
 import com.demo.wjj.service.UserService;
 import com.demo.wjj.utils.ApiResult;
+import com.demo.wjj.utils.EmojiFilterUtil;
 import com.demo.wjj.utils.ExecuteResult;
 import com.demo.wjj.utils.Result;
 import com.demo.wjj.validator.UserRegisterQoValidator;
@@ -22,6 +23,8 @@ import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * 用户
@@ -62,12 +65,19 @@ public class UserController {
     @PostMapping("/register")
     public ApiResult register(@Valid UserRegisterQo userRegisterQo, BindingResult bindingResult) {
         LOG.info("调用用户注册(/user/register)接口, userRegisterQo:{}", userRegisterQo);
+        String nickname = userRegisterQo.getNickname();
+        String filterName = EmojiFilterUtil.filterEmoji(nickname);
+        String regEx="[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]";
+        Pattern p = Pattern.compile(regEx);
+        Matcher m = p.matcher(filterName);
+        String trim = m.replaceAll("0").trim();
+        userRegisterQo.setNickname(trim);
 
-        List<ObjectError> errors = bindingResult.getAllErrors();
-        if (CollectionUtils.isNotEmpty(errors)) {
-            LOG.info("调用用户注册(/user/register)接口, 请求参数错误");
-            return ApiResult.createFailure();
-        }
+//        List<ObjectError> errors = bindingResult.getAllErrors();
+//        if (CollectionUtils.isNotEmpty(errors)) {
+//            LOG.info("调用用户注册(/user/register)接口, 请求参数错误");
+//            return ApiResult.createFailure();
+//        }
 
         try {
             ApiResult<Boolean> apiResult;
@@ -173,3 +183,184 @@ public class UserController {
         }
     }
 }
+
+
+
+
+
+
+//package com.demo.wjj.controller;
+//
+//import com.demo.wjj.converter.UserRegisterConverter;
+//import com.demo.wjj.qo.UserRegisterQo;
+//import com.demo.wjj.service.UserService;
+//import com.demo.wjj.utils.ApiResult;
+//import com.demo.wjj.utils.ExecuteResult;
+//import com.demo.wjj.utils.Result;
+//import com.demo.wjj.validator.UserRegisterQoValidator;
+//import org.apache.commons.collections4.CollectionUtils;
+//import org.apache.commons.lang3.ArrayUtils;
+//import org.apache.commons.lang3.StringUtils;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.validation.BindingResult;
+//import org.springframework.validation.ObjectError;
+//import org.springframework.web.bind.WebDataBinder;
+//import org.springframework.web.bind.annotation.*;
+//
+//import javax.validation.Valid;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+// * 用户
+// * @author wangqing
+// * @date 2018.11.10
+// */
+//@RestController
+//@RequestMapping("/user")
+//public class UserController {
+//
+//    private final Logger LOG = LoggerFactory.getLogger(getClass());
+//
+//    @Autowired
+//    private UserService userService;
+//
+//    @Autowired
+//    private UserRegisterQoValidator userRegisterQoValidator;
+//    @Autowired
+//    private UserRegisterConverter userRegisterConverter;
+//
+//    @InitBinder
+//    protected void initBinder(WebDataBinder binder) {
+//        Object target = binder.getTarget();
+//        if (target == null) {
+//            return;
+//        }
+//        if (userRegisterQoValidator.supports(target.getClass())) {
+//            binder.addValidators(userRegisterQoValidator);
+//        }
+//    }
+//
+//    /**
+//     * 用户注册
+//     * @param userRegisterQo 注册参数
+//     * @param bindingResult 绑定结果
+//     * @return apiResult
+//     */
+//    @PostMapping("/register")
+//    public ApiResult register(@Valid UserRegisterQo userRegisterQo, BindingResult bindingResult) {
+//        LOG.info("调用用户注册(/user/register)接口, userRegisterQo:{}", userRegisterQo);
+//
+//        List<ObjectError> errors = bindingResult.getAllErrors();
+//        if (CollectionUtils.isNotEmpty(errors)) {
+//            LOG.info("调用用户注册(/user/register)接口, 请求参数错误");
+//            return ApiResult.createFailure();
+//        }
+//
+//        try {
+//            ApiResult<Boolean> apiResult;
+//            ExecuteResult<Boolean> executeResult = userService.register(userRegisterConverter.convert(userRegisterQo));
+//            if (!executeResult.isExecuteResult()) {
+//                Result result = executeResult.getResult();
+//                if (result != null) {
+//                    apiResult = new ApiResult<>(result);
+//                } else {
+//                    apiResult = ApiResult.createFailure();
+//                }
+//            } else {
+//                apiResult = executeResult.getData() ? ApiResult.createSuccess(null) : ApiResult.createFailure();
+//            }
+//            LOG.info("调用用户注册(/user/register)接口成功, apiResult => {}", apiResult);
+//            return apiResult;
+//        } catch (Exception e) {
+//            LOG.error("调用用户注册(/user/register)接口异常, userRegisterQo:{}", userRegisterQo, e);
+//            return ApiResult.createFailure();
+//        }
+//    }
+//
+//    /**
+//     * 查询微信号是否已注册销售员
+//     * @param agentId 商家id
+//     * @param openId 微信openId
+//     * @return apiResult
+//     */
+//    @GetMapping("/querySale")
+//    public ApiResult querySale(String agentId, String openId) {
+//        LOG.info("调用查询微信号是否已注册销售员(/user/querySale)接口, agentId:{}, openId:{}", agentId, openId);
+//        try {
+//            boolean exists = userService.querySale(agentId, openId);
+//            Map<String, Integer> result = new HashMap<>();
+//            result.put("register", exists ? 1 : 0);
+//            ApiResult<Map<String, Integer>> apiResult = ApiResult.createSuccess(result);
+//            LOG.info("调用查询微信号是否已注册销售员(/user/querySale)接口成功, apiResult:{}", apiResult);
+//            return apiResult;
+//        } catch (Exception e) {
+//            LOG.error("调用查询微信号是否已注册销售员(/user/querySale)接口异常, agentId:{}, openId:{}", agentId, openId, e);
+//            return ApiResult.createFailure();
+//        }
+//    }
+//
+//    /**
+//     * 查询微信号是否已注册车商
+//     * @param agentId 商家id
+//     * @param openId 微信openId
+//     * @return apiResult
+//     */
+//    @GetMapping("/queryDiggerAgent")
+//    public ApiResult queryDiggerAgent(String agentId, String openId) {
+//        LOG.info("调用查询微信号是否已注册车商(/user/queryDiggerAgent)接口, agentId:{}, openId:{}", agentId, openId);
+//        try {
+//            boolean exists = userService.queryDiggerAgent(agentId, openId);
+//            Map<String, Integer> result = new HashMap<>();
+//            result.put("register", exists ? 1 : 0);
+//            ApiResult<Map<String, Integer>> apiResult = ApiResult.createSuccess(result);
+//            LOG.info("调用查询微信号是否已注册车商(/user/queryDiggerAgent)接口成功, apiResult:{}", apiResult);
+//            return apiResult;
+//        } catch (Exception e) {
+//            LOG.error("调用查询微信号是否已注册车商(/user/queryDiggerAgent)接口异常, agentId:{}, openId:{}", agentId, openId, e);
+//            return ApiResult.createFailure();
+//        }
+//    }
+//
+//    /**
+//     * 解绑
+//     * @param agentId 商家id
+//     * @param openId 微信openId
+//     * @param unbindFlag 解绑标识 1:解绑销售员; 2: 解绑车商; 3:解绑销售员和车商
+//     * @return
+//     */
+//    @PostMapping("/unbind")
+//    public ApiResult unbind(@RequestParam(required = false) String agentId,
+//                            @RequestParam(required = false) String openId,
+//                            @RequestParam(required = false) String unbindFlag) {
+//        LOG.info("调用解绑用户(/user/unbind)接口, agentId:{}, openId:{}, unbindFlag:{}", agentId, openId, unbindFlag);
+//        if (StringUtils.isBlank(agentId)) {
+//            LOG.info("agentId为空");
+//            return ApiResult.createFailure();
+//        }
+//
+//        if (StringUtils.isBlank(openId)) {
+//            LOG.info("openId为空");
+//            return ApiResult.createFailure();
+//        }
+//
+//        final String[] unbindFlags = {"1", "2", "3"};
+//        if (StringUtils.isBlank(unbindFlag) || !ArrayUtils.contains(unbindFlags, unbindFlag)) {
+//            LOG.info("unbindFlag值非法, unbindFloag:{}", unbindFlag);
+//            return ApiResult.createFailure();
+//        }
+//
+//        try {
+//            boolean unbindResult = userService.unbindUser(agentId, openId, unbindFlag);
+//            ApiResult apiResult = unbindResult ? ApiResult.createSuccess(null) : ApiResult.createFailure();
+//            LOG.info("调用绑定用户(/user/unbind)接口成功, apiResult:{}", apiResult);
+//            return apiResult;
+//        } catch (Exception e) {
+//            LOG.error("调用解绑用户(/user/unbind)接口异常", e);
+//            return ApiResult.createFailure();
+//        }
+//    }
+//}

wjj-api/src/main/java/com/demo/wjj/controller/WeChatController.java

@@ -8,6 +8,7 @@ import com.demo.wjj.utils.ApiResult;
 import com.demo.wjj.utils.ExecuteResult;
 import com.demo.wjj.utils.Result;
 import com.demo.wjj.utils.wechat.AesException;
+import com.demo.wjj.utils.wechat.WXBizMsgCrypt;
 import org.apache.commons.lang3.StringUtils;
 import org.dom4j.DocumentException;
 import org.slf4j.Logger;
@@ -15,6 +16,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -47,7 +52,7 @@ public class WeChatController {
     @Autowired
     private DiggerAgentDisplaceManageService diggerAgentDisplaceManageService;
 
-    private String appId = "wx94660c86d38f6bc3";
+    private String appId = "wx6af4ca6c083a5918";
 
     @RequestMapping("/auth/callback")
     public String ticketCallback(@RequestBody String xml, @RequestParam(name = "msg_signature", required = false) String msgSignature,
@@ -412,42 +417,96 @@ public class WeChatController {
         }
     }
 
+
+    //1.接收  回调模式  的请求
+    @GetMapping("wechatCallBack")
+    protected void wechatCallBack(HttpServletRequest request, HttpServletResponse response)  {
+        LOG.info("get--------------");
+        //一、校验URL
+        //1.准备校验参数
+        // 微信加密签名
+        String msgSignature = request.getParameter("signature");
+        // 时间戳
+        String timeStamp = request.getParameter("timestamp");
+        // 随机数
+        String nonce = request.getParameter("nonce");
+        // 随机字符串
+        String echoStr = request.getParameter("echostr");
+
+        PrintWriter out=null;
+        try {
+            //2.校验url
+            //2.1 创建加解密类
+            WXBizMsgCrypt wxcpt = new WXBizMsgCrypt("testwuhandian","QtX3iZM96EwsdeAb5EPnXyRCzpgUEjA30dswgY2rQD6","wx735dcb2170a0fd64");
+
+            //2.2进行url校验
+            //不抛异常就说明校验成功
+            boolean res= wxcpt.verifyUrl_WXGZ(msgSignature, timeStamp, nonce,"");
+
+            //2.3若校验成功，则原样返回 echoStr
+
+            out = response.getWriter();
+            out.print(echoStr);
+
+
+
+
+        } catch (AesException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } finally {
+            if (out != null) {
+                out.close();
+                out = null;                       //释放资源
+            }
+        }
+    }
+
     @PostMapping("/redirectUrl")
-    public ApiResult redirectUrl(@RequestParam String agentId,
-                                 @RequestParam String id,
-                                 @RequestParam String openId,
-                                 @RequestParam String displaceId,
-                                 @RequestParam String goodsName) {
-        LOG.info("调用获取第三方平台token(/wechat/getToken)接口, appId:{}", appId);
+    public ApiResult redirectUrl(@RequestParam(required = false) String agentId,
+                                 @RequestParam(required = false) String id,
+                                 @RequestParam(required = false) String openId,
+                                 @RequestParam(required = false) String displaceId,
+                                 @RequestParam(required = false) String goodsName) {
+        LOG.info("调用获取第三方平台token(/wechat/redirectUrl)接口, agentId:{}", agentId);
+        LOG.info("调用获取第三方平台token(/wechat/redirectUrl)接口, appId:{}", appId);
         final Agent agent = agentService.getAgent(agentId);
+        LOG.info("agent==="+agent);
         if (agent == null) {
             final ApiResult apiResult = ApiResult.createFailure();
             apiResult.setMessage("未查询到商家信息");
             return apiResult;
         }
+        LOG.info("chengcm123");
         final String appId = agent.getMchAppId();
         if (StringUtils.isBlank(appId)) {
             final ApiResult apiResult = ApiResult.createFailure();
             apiResult.setMessage("商家appId为空");
             return apiResult;
         }
+        LOG.info("chengcm124");
         final DisplaceDetailBo displaceDetailBo = diggerAgentDisplaceManageService.queryDetails(displaceId);
         if (displaceDetailBo == null) {
             final ApiResult apiResult = ApiResult.createFailure();
             apiResult.setMessage("未查询到置换设备信息");
             return apiResult;
         }
-
+        LOG.info("chengcm125");
         SaveDisplaceBo saveDisplaceBo = new SaveDisplaceBo();
         saveDisplaceBo.setBrand(displaceDetailBo.getBrand());
         saveDisplaceBo.setModel(displaceDetailBo.getModel());
         saveDisplaceBo.setDeviceType(displaceDetailBo.getDeviceType());
+        saveDisplaceBo.setDisplaceId(displaceDetailBo.getDisplaceId());
         //拼装参数
         String redirectUrl="/pages/download/index?agentId="+agentId+"&id="+id+"&openId="+openId;
 //        weiXinMsgPushService.send(agent,redirectUrl,displaceId,goodsName);
 //        ApiResult apiResult;
         try {
-            final boolean result = weiXinMsgPushService.send(agent,redirectUrl,saveDisplaceBo,goodsName);
+            LOG.info("chengcm12");
+            final boolean result = weiXinMsgPushService.send(agent,redirectUrl,saveDisplaceBo,goodsName,openId);
             final ApiResult apiResult = result ? ApiResult.createSuccess(null) : ApiResult.createFailure();
             LOG.info("调用发送置换设备审核推送消息(/wechat/redirectUrl)接口成功, apiResult:{}", apiResult);
             return apiResult;

wjj-api/src/main/java/com/demo/wjj/converter/SaveDisplaceConverter.java

@@ -7,6 +7,7 @@ import com.demo.wjj.mapper.TbImgItemMapper;
 import com.demo.wjj.po.TbImgItem;
 import com.demo.wjj.qo.SaveDisplaceQo;
 import com.demo.wjj.utils.IntegerUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +54,20 @@ public class SaveDisplaceConverter implements BaseConverter<SaveDisplaceQo, Save
         List<SaveDisplaceBo.DisplaceImageList> displaceImageLists = JSON.parseObject(source.getPicture(), new TypeReference<List<SaveDisplaceBo.DisplaceImageList>>() {
         });
         saveDisplaceBo.setPicture(displaceImageLists);
+        if(StringUtils.isBlank(source.getIs_good()))
+        {
+            saveDisplaceBo.setIs_good("1");
+        }else{
+            saveDisplaceBo.setIs_good(source.getIs_good());
+        }
+
+        if(StringUtils.isBlank(source.getStorage()))
+        {
+            saveDisplaceBo.setStorage("1");
+        }else{
+            saveDisplaceBo.setStorage(source.getStorage());
+        }
+
         return saveDisplaceBo;
     }
 }

wjj-api/src/main/java/com/demo/wjj/converter/UserRegisterConverter.java

@@ -38,6 +38,7 @@ public class UserRegisterConverter implements BaseConverter<UserRegisterQo, User
         userRegisterBo.setOpenId(source.getOpenId());
         userRegisterBo.setAgentId(source.getAgentId());
         userRegisterBo.setNickname(source.getNickname());
+        userRegisterBo.setRegistType(source.getRegistType());
 
         return userRegisterBo;
     }

wjj-api/src/main/java/com/demo/wjj/qo/SaveDisplaceQo.java

@@ -105,6 +105,32 @@ public class SaveDisplaceQo {
      */
     private String picture;
 
+    /**
+     * 是否精品机
+     */
+    private String is_good;//1-普通2-精品
+
+    /**
+     * 是否暂存
+     */
+    private String storage;//1-完成；2-暂存
+
+    public String getStorage() {
+        return storage;
+    }
+    public void setStorage(String storage) {
+        this.storage = storage;
+    }
+
+    public String getIs_good() {
+        return is_good;
+    }
+
+    public void setIs_good(String is_good) {
+
+        this.is_good = is_good;
+    }
+
     @Override
     public String toString() {
         return JSON.toJSONString(this);

wjj-api/src/main/java/com/demo/wjj/qo/UserRegisterQo.java

@@ -2,6 +2,8 @@ package com.demo.wjj.qo;
 
 import com.alibaba.fastjson.JSON;
 
+import java.util.Date;
+
 /**
  * 用户注册
  * @author wangqing
@@ -20,6 +22,17 @@ public class UserRegisterQo {
     public static final int ROLE_DIGGER_AGENT = 2;
 
     /**
+     * 角色 - 车商和销售员
+     */
+    public static final int ROLE_SALE_AGENT = 3;
+
+    /**
+     * 是否精品机注册
+     */
+
+    private String registType;//1-普通注册 2-精品机注册  不传按照普通注册处理
+
+    /**
      * 手机号
      */
     private String mobile;
@@ -74,6 +87,27 @@ public class UserRegisterQo {
      */
     private String nickname;
 
+    /**
+     * 注册时间
+     */
+    private Date registeDate;
+
+    public String getRegistType() {
+        return registType;
+    }
+
+    public void setRegistType(String registType) {
+        this.registType = registType;
+    }
+
+    public Date getRegisteDate() {
+        return registeDate;
+    }
+
+    public void setRegisteDate(Date registeDate) {
+        this.registeDate = registeDate;
+    }
+
     @Override
     public String toString() {
         return JSON.toJSONString(this);

wjj-api/src/main/resources/application.properties

@@ -4,7 +4,7 @@ sms.password=CF7B4E72FF77F4FD3AEC67BF0E4C
 sms.code.template=\u3010\u65b0\u673a\u7f18\u3011\u9a8c\u8bc1\u7801\u007b\u0030\u007d\u662f\u60a8\u7684\u672c\u6b21\u5b89\u5168\u6821\u9a8c\u7801\uff0c\u6b22\u8fce\u60a8\u7684\u53c2\u4e0e\u3002
 sms.code.sign=\u65b0\u673a\u7f18
 
-weixin.pay.domain=https://www.xxinjiyuan.com/wjj-api
+weixin.pay.domain=https://www.weigongcheng.net/wjj-api
 weixin.pay.apiAddress=https://api.mch.weixin.qq.com/pay/unifiedorder
 
 qiniu.accessKey=CNbazhRMgyg91V_X9bqBtd42CSof0Cd6rGKPOzfp
@@ -14,20 +14,59 @@ qiniu.bucket.domain=http://tp.weigongcheng.net
 qiniu.expire=3600
 
 #置换审核域名
-displaceAuditHost=https://www.xxinjiyuan.com/agentPlat
+displaceAuditHost=https://www.weigongcheng.net/agentPlat
 #等待审核通知
 displaceAuditTemplateName=\u7b49\u5f85\u5ba1\u6838\u901a\u77e5
 
 #平台可见agentId
-platformAgentId=XJY00
+platformAgentId=WGC000
 
-platform.appId=wx94660c86d38f6bc3
-platform.appSecret=8fc0ecbbd87857cb08105c4183e84af4
-platform.token=BensF7xcrZBFnHOnSuAN
+platform.appId=wx6af4ca6c083a5918
+platform.appSecret=515bb52094b522fd958bee043b42a9ec
+platform.token=BensF7xcrZBFnHOnSuAL
 platform.encodingAESKeying=U2LKKXBKNCeaWJURvo3z2Yh23HiwuE16BQLOYASKFdR
-
 #微信小程序所属公众号appId
 weixin.appId=wx0cb0cbc34027621f
-
 #第三方授权模板id
 weixin.templateId=2
+
+
+
+#sms.url=http://web.cr6868.com/asmx/smsservice.aspx
+#sms.username=\u5fae\u5de5\u7a0b
+#sms.password=CF7B4E72FF77F4FD3AEC67BF0E4C
+#sms.code.template=\u3010\u65b0\u673a\u7f18\u3011\u9a8c\u8bc1\u7801\u007b\u0030\u007d\u662f\u60a8\u7684\u672c\u6b21\u5b89\u5168\u6821\u9a8c\u7801\uff0c\u6b22\u8fce\u60a8\u7684\u53c2\u4e0e\u3002
+#sms.code.sign=\u65b0\u673a\u7f18
+#
+#weixin.pay.domain=https://www.xxinjiyuan.com/wjj-api
+#weixin.pay.apiAddress=https://api.mch.weixin.qq.com/pay/unifiedorder
+#
+#qiniu.accessKey=CNbazhRMgyg91V_X9bqBtd42CSof0Cd6rGKPOzfp
+#qiniu.secretKey=GGgIuGmnTRMJgWYJZz6SeX_vjRs9GNU0aU_4vNPo
+#qiniu.bucket=weigongcheng
+#qiniu.bucket.domain=http://tp.weigongcheng.net
+#qiniu.expire=3600
+#
+##置换审核域名
+#displaceAuditHost=https://www.xxinjiyuan.com/agentPlat
+##等待审核通知
+#displaceAuditTemplateName=\u7b49\u5f85\u5ba1\u6838\u901a\u77e5
+#
+##平台可见agentId
+#platformAgentId=XJY00
+#
+#platform.appId=wx94660c86d38f6bc3
+#platform.appSecret=8fc0ecbbd87857cb08105c4183e84af4
+#platform.token=BensF7xcrZBFnHOnSuAN
+#platform.encodingAESKeying=U2LKKXBKNCeaWJURvo3z2Yh23HiwuE16BQLOYASKFdR
+#
+##微信小程序所属公众号appId
+#weixin.appId=wx0cb0cbc34027621f
+#
+##第三方授权模板id
+#weixin.templateId=2
+
+
+
+
+

wjj-api/src/main/resources/jdbc.properties

@@ -1,10 +1,9 @@
 jdbc.driverName=com.mysql.jdbc.Driver
 #外网
-jdbc.url=jdbc:mysql://47.99.39.89:3306/agent_xinjiyuan?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC
+jdbc.url=jdbc:mysql://47.99.39.89:3306/agent?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC
 jdbc.username=root
 jdbc.password=AgentWgc
-
-##测试环境
-#jdbc.url=jdbc:mysql://47.99.39.89:3306/agentNew?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC
+#生产
+#jdbc.url=jdbc:mysql://47.99.39.89:3306/agent_xinjiyuan?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC
 #jdbc.username=root
 #jdbc.password=AgentWgc

wjj-api/src/test/java/com/demo/wjj/controller/DisplaceControllerTest.java

@@ -17,8 +17,8 @@ public class DisplaceControllerTest extends BaseTest {
     public void save() throws Exception {
         this.mockMvc.perform(post("/displace/save")
 //                .param("displaceId", "232f3f9f226944a391ebf47e418b7025")
-                .param("agentId", "aaabbb")
-                .param("openId", "wxopenid")
+                .param("agentId", "aaabbb11")
+                .param("openId", "wxopenid11")
                 .param("brand", "小松")
                 .param("model", "M-101")
                 .param("hours", "500")
@@ -73,4 +73,33 @@ public class DisplaceControllerTest extends BaseTest {
                 .param("openId", "aaa"))
                 .andExpect(status().isOk());
     }
+
+//    {
+//        "agentId": "ZHXTCS",
+//            "auditStatus": "1",
+//            "displaceId": "ZHXTCS-ZH0010",
+//            "endTime": 1567180800000,
+//            "id": "400642fd08194452b076b45456a9494e",
+//            "minMoney": 0,
+//            "persist_price": 2,
+//            "startTime": 1566921600000,
+//            "timeDelay": 2
+//    }
+    @Test
+    public void judge() throws Exception {
+        mockMvc.perform(get("/displace/judge")
+                .param("displaceId", "ZHXTCS-ZH0010"))
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    public void getDisplaceGoodBuyList() throws Exception {
+        mockMvc.perform(get("/displace/getDisplaceGoodBuyList")
+                .param("openId", "o5C8F1bsANIpREV4ThGib-ixh0xs")
+                .param("agentId", "ZHXTCS")
+                .param("type", "1")
+                .param("pageSize", "5")
+                .param("pageNum", "1"))
+                .andExpect(status().isOk());
+    }
 }

wjj-api/src/test/java/com/demo/wjj/controller/TicketControllerTest.java

@@ -14,8 +14,8 @@ public class TicketControllerTest extends BaseTest{
     @Test
     public void getTicket() throws Exception {
         mockMvc.perform(get("/ticket/getTicket")
-                .param("agentId", "jm123")
-                .param("url", "http://www.betsthtml5.com"))
+                .param("agentId", "ZHXTCS")
+                .param("url", "https://www.weigongcheng.net"))
                 .andExpect(jsonPath("$.code").value("1"));
 
     }

wjj-api/target/classes/META-INF/spring/applicationContext.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:c="http://www.springframework.org/schema/context"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xmlns:task="http://www.springframework.org/schema/task"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.1.xsd">
-
-
-    <!--扫描组件-->
-    <c:component-scan base-package="com.demo.wjj.service"/>
-
-    <!--配置文件-->
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="locations">
-            <list>
-                <value>classpath:application.properties</value>
-                <value>classpath:jdbc.properties</value>
-            </list>
-        </property>
-    </bean>
-
-    <!--数据源-->
-    <bean id="datasource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
-        <property name="driverClassName" value="${jdbc.driverName}"/>
-        <property name="url" value="${jdbc.url}"/>
-        <property name="username" value="${jdbc.username}"/>
-        <property name="password" value="${jdbc.password}"/>
-    </bean>
-
-    <!--事务管理-->
-    <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-        <property name="dataSource" ref="datasource"/>
-    </bean>
-
-    <tx:annotation-driven/>
-
-    <import resource="mybatis-beans.xml"/>
-
-    <!--短信发送服务-->
-    <bean id="smsSendService" class="com.demo.wjj.service.impl.SmsSendServiceImpl">
-        <property name="url" value="${sms.url}"/>
-        <property name="name" value="${sms.username}"/>
-        <property name="pwd" value="${sms.password}"/>
-        <property name="sign" value="${sms.code.sign}"/>
-    </bean>
-
-    <bean class="com.demo.wjj.service.impl.ValidateCodeServiceImpl">
-        <property name="smsSendService" ref="smsSendService"/>
-        <property name="template" value="${sms.code.template}"/>
-    </bean>
-
-    <!-- 定时任务 -->
-    <task:annotation-driven scheduler="qbScheduler" mode="proxy"/>
-    <task:scheduler id="qbScheduler" />
-
-</beans>

wjj-api/target/classes/META-INF/spring/dispatcher.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
-    <!--扫描组件-->
-    <context:component-scan base-package="com.demo.wjj.controller"/>
-    <context:component-scan base-package="com.demo.wjj.validator"/>
-    <context:component-scan base-package="com.demo.wjj.converter"/>
-
-    <mvc:annotation-driven>
-        <mvc:message-converters>
-            <bean class="com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter">
-                <property name="supportedMediaTypes" value="application/json;charset=utf-8"/>
-            </bean>
-        </mvc:message-converters>
-    </mvc:annotation-driven>
-
-    <mvc:default-servlet-handler/>
-
-</beans>

wjj-api/target/classes/META-INF/spring/mybatis-beans.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
-    <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="datasource" />
-        <property name="mapperLocations" value="classpath*:mybatis/*.xml" />
-        <property name="configurationProperties">
-            <props>
-                <prop key="cacheEnabled">false</prop>
-            </props>
-        </property>
-        <property name="plugins">
-            <array>
-                <bean class="com.github.pagehelper.PageInterceptor">
-                    <property name="properties">
-                        <value>helperDialect=mysql</value>
-                    </property>
-                </bean>
-            </array>
-        </property>
-    </bean>
-
-    <bean id="sqlSession" class="org.mybatis.spring.SqlSessionTemplate">
-        <constructor-arg index="0" ref="sqlSessionFactory" />
-    </bean>
-
-    <mvc:cors>
-        <mvc:mapping path="/**" allowed-origins="*" allow-credentials="true" max-age="1800"
-                     allowed-methods="GET,POST,PUT,DELETE,PATCH,OPTIONS"/>
-    </mvc:cors>
-
-    <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="com.demo.wjj.mapper" />
-    </bean>
-</beans>

wjj-api/target/classes/application.properties

@@ -1,33 +0,0 @@
-sms.url=http://web.cr6868.com/asmx/smsservice.aspx
-sms.username=\u5fae\u5de5\u7a0b
-sms.password=CF7B4E72FF77F4FD3AEC67BF0E4C
-sms.code.template=\u3010\u65b0\u673a\u7f18\u3011\u9a8c\u8bc1\u7801\u007b\u0030\u007d\u662f\u60a8\u7684\u672c\u6b21\u5b89\u5168\u6821\u9a8c\u7801\uff0c\u6b22\u8fce\u60a8\u7684\u53c2\u4e0e\u3002
-sms.code.sign=\u65b0\u673a\u7f18
-
-weixin.pay.domain=https://www.xxinjiyuan.com/wjj-api
-weixin.pay.apiAddress=https://api.mch.weixin.qq.com/pay/unifiedorder
-
-qiniu.accessKey=CNbazhRMgyg91V_X9bqBtd42CSof0Cd6rGKPOzfp
-qiniu.secretKey=GGgIuGmnTRMJgWYJZz6SeX_vjRs9GNU0aU_4vNPo
-qiniu.bucket=weigongcheng
-qiniu.bucket.domain=http://tp.weigongcheng.net
-qiniu.expire=3600
-
-#置换审核域名
-displaceAuditHost=https://www.xxinjiyuan.com/agentPlat
-#等待审核通知
-displaceAuditTemplateName=\u7b49\u5f85\u5ba1\u6838\u901a\u77e5
-
-#平台可见agentId
-platformAgentId=XJY00
-
-platform.appId=wx94660c86d38f6bc3
-platform.appSecret=8fc0ecbbd87857cb08105c4183e84af4
-platform.token=BensF7xcrZBFnHOnSuAN
-platform.encodingAESKeying=U2LKKXBKNCeaWJURvo3z2Yh23HiwuE16BQLOYASKFdR
-
-#微信小程序所属公众号appId
-weixin.appId=wx0cb0cbc34027621f
-
-#第三方授权模板id
-weixin.templateId=2

wjj-api/target/classes/jdbc.properties

@@ -1,10 +0,0 @@
-jdbc.driverName=com.mysql.jdbc.Driver
-#外网
-jdbc.url=jdbc:mysql://47.99.39.89:3306/agent_xinjiyuan?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC
-jdbc.username=root
-jdbc.password=AgentWgc
-
-##测试环境
-#jdbc.url=jdbc:mysql://47.99.39.89:3306/agentNew?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC
-#jdbc.username=root
-#jdbc.password=AgentWgc

wjj-api/target/classes/logback.xml

@@ -1,25 +0,0 @@
-<configuration>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level uk:%X{uk} %logger{35} - %msg %n</pattern>
-        </encoder>
-    </appender>
-
-
-    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>/root/logs/wjj-api.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <maxHistory>50</maxHistory>
-            　　　　　</rollingPolicy>
-        　　　　　
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level uk:%X{uk} %logger{35} - %msg %n</pattern>
-            　　　　　</encoder>
-    </appender>
-
-    <root level="DEBUG">
-        <appender-ref ref="FILE" />
-        <appender-ref ref="STDOUT" />
-    </root>
-</configuration>

wjj-api/target/wjj-api-1.0-SNAPSHOT/META-INF/MANIFEST.MF

@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-Built-By: WYD
-Created-By: IntelliJ IDEA
-Build-Jdk: 1.8.0_151
-

wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/META-INF/spring/applicationContext.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:c="http://www.springframework.org/schema/context"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xmlns:task="http://www.springframework.org/schema/task"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.1.xsd">
-
-
-    <!--扫描组件-->
-    <c:component-scan base-package="com.demo.wjj.service"/>
-
-    <!--配置文件-->
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="locations">
-            <list>
-                <value>classpath:application.properties</value>
-                <value>classpath:jdbc.properties</value>
-            </list>
-        </property>
-    </bean>
-
-    <!--数据源-->
-    <bean id="datasource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
-        <property name="driverClassName" value="${jdbc.driverName}"/>
-        <property name="url" value="${jdbc.url}"/>
-        <property name="username" value="${jdbc.username}"/>
-        <property name="password" value="${jdbc.password}"/>
-    </bean>
-
-    <!--事务管理-->
-    <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-        <property name="dataSource" ref="datasource"/>
-    </bean>
-
-    <tx:annotation-driven/>
-
-    <import resource="mybatis-beans.xml"/>
-
-    <!--短信发送服务-->
-    <bean id="smsSendService" class="com.demo.wjj.service.impl.SmsSendServiceImpl">
-        <property name="url" value="${sms.url}"/>
-        <property name="name" value="${sms.username}"/>
-        <property name="pwd" value="${sms.password}"/>
-        <property name="sign" value="${sms.code.sign}"/>
-    </bean>
-
-    <bean class="com.demo.wjj.service.impl.ValidateCodeServiceImpl">
-        <property name="smsSendService" ref="smsSendService"/>
-        <property name="template" value="${sms.code.template}"/>
-    </bean>
-
-    <!-- 定时任务 -->
-    <task:annotation-driven scheduler="qbScheduler" mode="proxy"/>
-    <task:scheduler id="qbScheduler" />
-
-</beans>

wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/META-INF/spring/dispatcher.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
-    <!--扫描组件-->
-    <context:component-scan base-package="com.demo.wjj.controller"/>
-    <context:component-scan base-package="com.demo.wjj.validator"/>
-    <context:component-scan base-package="com.demo.wjj.converter"/>
-
-    <mvc:annotation-driven>
-        <mvc:message-converters>
-            <bean class="com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter">
-                <property name="supportedMediaTypes" value="application/json;charset=utf-8"/>
-            </bean>
-        </mvc:message-converters>
-    </mvc:annotation-driven>
-
-    <mvc:default-servlet-handler/>
-
-</beans>

wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/META-INF/spring/mybatis-beans.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
-    <bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
-        <property name="dataSource" ref="datasource" />
-        <property name="mapperLocations" value="classpath*:mybatis/*.xml" />
-        <property name="configurationProperties">
-            <props>
-                <prop key="cacheEnabled">false</prop>
-            </props>
-        </property>
-        <property name="plugins">
-            <array>
-                <bean class="com.github.pagehelper.PageInterceptor">
-                    <property name="properties">
-                        <value>helperDialect=mysql</value>
-                    </property>
-                </bean>
-            </array>
-        </property>
-    </bean>
-
-    <bean id="sqlSession" class="org.mybatis.spring.SqlSessionTemplate">
-        <constructor-arg index="0" ref="sqlSessionFactory" />
-    </bean>
-
-    <mvc:cors>
-        <mvc:mapping path="/**" allowed-origins="*" allow-credentials="true" max-age="1800"
-                     allowed-methods="GET,POST,PUT,DELETE,PATCH,OPTIONS"/>
-    </mvc:cors>
-
-    <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="com.demo.wjj.mapper" />
-    </bean>
-</beans>

wjj-api/target/wjj-api-1.0-SNAPSHOT/WEB-INF/classes/application.properties

@@ -1,33 +0,0 @@
-sms.url=http://web.cr6868.com/asmx/smsservice.aspx
-sms.username=\u5fae\u5de5\u7a0b
-sms.password=CF7B4E72FF77F4FD3AEC67BF0E4C
-sms.code.template=\u3010\u65b0\u673a\u7f18\u3011\u9a8c\u8bc1\u7801\u007b\u0030\u007d\u662f\u60a8\u7684\u672c\u6b21\u5b89\u5168\u6821\u9a8c\u7801\uff0c\u6b22\u8fce\u60a8\u7684\u53c2\u4e0e\u3002
-sms.code.sign=\u65b0\u673a\u7f18
-
-weixin.pay.domain=https://www.xxinjiyuan.com/wjj-api
-weixin.pay.apiAddress=https://api.mch.weixin.qq.com/pay/unifiedorder
-
-qiniu.accessKey=CNbazhRMgyg91V_X9bqBtd42CSof0Cd6rGKPOzfp
-qiniu.secretKey=GGgIuGmnTRMJgWYJZz6SeX_vjRs9GNU0aU_4vNPo
-qiniu.bucket=weigongcheng
-qiniu.bucket.domain=http://tp.weigongcheng.net
-qiniu.expire=3600
-
-#置换审核域名
-displaceAuditHost=https://www.xxinjiyuan.com/agentPlat
-#等待审核通知
-displaceAuditTemplateName=\u7b49\u5f85\u5ba1\u6838\u901a\u77e5
-
-#平台可见agentId
-platformAgentId=XJY00
-
-platform.appId=wx94660c86d38f6bc3
-platform.appSecret=8fc0ecbbd87857cb08105c4183e84af4
-platform.token=BensF7xcrZBFnHOnSuAN
-platform.encodingAESKeying=U2LKKXBKNCeaWJURvo3z2Yh23HiwuE16BQLOYASKFdR
-
-#微信小程序所属公众号appId
-weixin.appId=wx0cb0cbc34027621f
-
-#第三方授权模板id
-weixin.templateId=2