上传最新代码

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.util.Map;
 
 
 /**
@@ -103,8 +104,8 @@ public class DiggerAgentDisplaceController {
 
         try {
             PageBean pageBean = PageBean.create(request);
-            PageInfo<DisplaceListBo> pageInfo = diggerAgentDisplaceManageService.queryEndList(date,agentId, openId,pageBean );
-            ApiResult<PageInfo<DisplaceListBo>> apiResult = ApiResult.createSuccess(pageInfo);
+            Map map = diggerAgentDisplaceManageService.queryEndList(date,agentId, openId,pageBean );
+            ApiResult apiResult = ApiResult.createSuccess(map);
             LOG.debug("已结束置换列表, apiResult:{}", apiResult);
             LOG.info("调用获取已结束的置换列表(/diggerDisplace/queryEnding)接口成功");
             return apiResult;

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

@@ -0,0 +1,41 @@
+package com.demo.wjj.controller;
+
+
+import com.demo.wjj.po.ImgItem;
+import com.demo.wjj.service.TbImgItemService;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+@RequestMapping("/imgItem")
+@RestController
+public class ItemController {
+    private final Logger LOG = LoggerFactory.getLogger(getClass());
+    @Autowired
+    private TbImgItemService tbImgItemService;
+    @GetMapping("/getImgItemList")
+    public ApiResult getImgItemList(@RequestParam(required = false) Integer type){
+        LOG.info("调用获取信息(/imgItem/getImgItemList)接口, type:{}", type);
+        if (type == null) {
+            LOG.info("type为空");
+            return ApiResult.createFailure();
+        }
+        try {
+            List<ImgItem> imgItemList = tbImgItemService.selectAll(type);
+            LOG.info("调用获取商家信息(/imgItem/getImgItemList)接口成功");
+            return ApiResult.createSuccess(imgItemList);
+
+        } catch (Exception e) {
+            LOG.error("调用获取商家信息(/imgItem/getImgItemList)接口异常", e);
+            return ApiResult.createFailure();
+        }
+    }
+}

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

@@ -0,0 +1,57 @@
+<?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

@@ -0,0 +1,23 @@
+<?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

@@ -0,0 +1,37 @@
+<?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

@@ -0,0 +1,33 @@
+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

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,25 @@
+<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

@@ -0,0 +1,5 @@
+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

@@ -0,0 +1,57 @@
+<?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

@@ -0,0 +1,23 @@
+<?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

@@ -0,0 +1,37 @@
+<?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

@@ -0,0 +1,33 @@
+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