圣诞快乐
# v1.3 更新列表
1. 【新增】砍价
2. 【新增】拼团
3. 【新增】一号通
4. 【修复】商品sku 编辑时出现商品属性对应错误的问题
5. 【修复】商品推广海报生成二维码可能会出错的问题【小程序调试中】
6. 【修复】微信公众号和小程序头像可能获取不到的问题
7. 【修复】下单时可能会出错的问题
8. 【修复】pc管理端用户访问量
9. 【修复】微信退款
10. 【修复】管理端订单状态可能出现不正确的情况
11. 【修复】WEB管理端-菜单色调，短信API更新，首页用户访问量，系统设置tab是自动选择下一及表单
12. 【修复】系统设置出现更新不正确的问题
This commit is contained in:
stivepeim
@@ -1,7 +1,8 @@
|
||||
# 配置端口
|
||||
server:
|
||||
port: 20001
|
||||
domain:
|
||||
domain: #配合swagger使用 # 待部署域名
|
||||
version: v1.3 # 当前代码版本
|
||||
wechat-api-url:
|
||||
asyncConfig: false
|
||||
asyncWeChatProgramTempList: false
|
||||
@@ -14,14 +15,14 @@ spring:
|
||||
datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driver-class-name: com.mysql.jdbc.Driver
|
||||
url: jdbc:mysql://121.196.17.222:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
|
||||
url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
|
||||
username: crmeb_java_beta
|
||||
password: Yx7Scb8zk7KZShM5
|
||||
password: yourPwd
|
||||
redis:
|
||||
host: 121.196.17.222 #地址
|
||||
host: 127.0.0.1 #地址
|
||||
port: 6379 #端口
|
||||
password: 9c4d4a99a3fa3122d9
|
||||
timeout: 1000 # 连接超时时间（毫秒）
|
||||
password: youPwd
|
||||
timeout: 30000 # 连接超时时间（毫秒）
|
||||
database: 0 #默认数据库
|
||||
jedis:
|
||||
pool:
|
||||
|
||||
33
crmeb/src/main/resources/application-dev.yml
Normal file
33
crmeb/src/main/resources/application-dev.yml
Normal file
@@ -0,0 +1,33 @@
|
||||
# 配置端口
|
||||
server:
|
||||
port: 20002
|
||||
domain: #配合swagger使用 # 待部署域名
|
||||
version: v1.3 # 当前代码版本
|
||||
wechat-api-url:
|
||||
asyncConfig: false
|
||||
asyncWeChatProgramTempList: false
|
||||
|
||||
spring:
|
||||
profiles:
|
||||
# 配置的环境
|
||||
active: dev
|
||||
# 数据库配置
|
||||
datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driver-class-name: com.mysql.jdbc.Driver
|
||||
url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
|
||||
username: crmeb_java_beta
|
||||
password: yourPwd
|
||||
redis:
|
||||
host: 127.0.0.1 #地址
|
||||
port: 6379 #端口
|
||||
password: youPwd
|
||||
timeout: 30000 # 连接超时时间（毫秒）
|
||||
database: 0 #默认数据库
|
||||
jedis:
|
||||
pool:
|
||||
max-active: 200 # 连接池最大连接数（使用负值表示没有限制）
|
||||
max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
|
||||
max-idle: 10 # 连接池中的最大空闲连接
|
||||
min-idle: 0 # 连接池中的最小空闲连接
|
||||
time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1
|
||||
@@ -1,7 +1,8 @@
|
||||
# 配置端口
|
||||
server:
|
||||
port: 20000
|
||||
domain: youDomain #配合swagger使用
|
||||
domain: api.java.crmeb.net #配合swagger使用 # 待部署域名
|
||||
version: v1.3 # 当前代码版本
|
||||
wechat-api-url:
|
||||
wechat-js-api-debug: false
|
||||
wechat-js-api-beta: false
|
||||
@@ -16,13 +17,13 @@ spring:
|
||||
datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driver-class-name: com.mysql.jdbc.Driver
|
||||
url: jdbc:mysql://127.0.0.1:3306/crmeb_java_test?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
|
||||
username: youMysqlAccount
|
||||
password: youMysqlPwd
|
||||
url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
|
||||
username: crmeb_java_beta
|
||||
password: yourPwd
|
||||
redis:
|
||||
host: redisPath #地址
|
||||
host: 127.0.0.1 #地址
|
||||
port: 6379 #端口
|
||||
password: #密码
|
||||
password: youPwd
|
||||
timeout: 30000 # 连接超时时间（毫秒）
|
||||
database: 0 #默认数据库
|
||||
jedis:
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
# 配置端口
|
||||
server:
|
||||
port: 8080
|
||||
domain:
|
||||
domain: #配合swagger使用 # 待部署域名
|
||||
version: v1.3 # 当前代码版本
|
||||
wechat-api-url: http://121.196.17.222:20003/ #请求微信接口中专服务器
|
||||
wechat-js-api-debug: true #微信js api系列是否开启调试模式
|
||||
wechat-js-api-debug: false #微信js api系列是否开启调试模式
|
||||
wechat-js-api-beta: true #微信js api是否是beta版本
|
||||
asyncConfig: false #是否同步config表数据到redis
|
||||
asyncWeChatProgramTempList: false #是否同步小程序公共模板库
|
||||
@@ -30,14 +31,14 @@ spring:
|
||||
datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driver-class-name: com.mysql.jdbc.Driver
|
||||
url: jdbc:mysql://121.196.17.222:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
|
||||
url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
|
||||
username: crmeb_java_beta
|
||||
password: Yx7Scb8zk7KZShM5
|
||||
password: yourPwd
|
||||
redis:
|
||||
host: 121.196.17.222 #地址
|
||||
host: 127.0.0.1 #地址
|
||||
port: 6379 #端口
|
||||
password: 9c4d4a99a3fa3122d9
|
||||
timeout: 1000 # 连接超时时间（毫秒）
|
||||
password: youPwd
|
||||
timeout: 30000 # 连接超时时间（毫秒）
|
||||
database: 0 #默认数据库
|
||||
jedis:
|
||||
pool:
|
||||
@@ -60,7 +61,7 @@ logging:
|
||||
# mybatis 配置
|
||||
mybatis-plus:
|
||||
mapper-locations: classpath*:mapper/*/*Mapper.xml #xml扫描，多个目录用逗号或者分号分隔（告诉 Mapper 所对应的 XML 文件位置）
|
||||
# 配置sql打印日志
|
||||
# 配置slq打印日志
|
||||
configuration:
|
||||
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
|
||||
global-config:
|
||||
|
||||
@@ -224,9 +224,9 @@
|
||||
<!-- 日志输出级别 -->
|
||||
<root level="INFO">
|
||||
<!-- <appender-ref ref="STDOUT"/>-->
|
||||
<appender-ref ref="DEBUG_FILE" />
|
||||
<appender-ref ref="INFO_FILE" />
|
||||
<appender-ref ref="WARN_FILE" />
|
||||
<!-- <appender-ref ref="DEBUG_FILE" />-->
|
||||
<!-- <appender-ref ref="INFO_FILE" />-->
|
||||
<!-- <appender-ref ref="WARN_FILE" />-->
|
||||
<appender-ref ref="ERROR_FILE" />
|
||||
<!--<appender-ref ref="LOGSTASH"/>-->
|
||||
</root>
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zbkj.crmeb.log.dao.StoreProductLogDao">
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zbkj.crmeb.bargain.dao.StoreBargainDao">
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zbkj.crmeb.bargain.dao.StoreBargainUserHelpDao">
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zbkj.crmeb.bargain.dao.StoreBargainUserDao">
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zbkj.crmeb.combination.dao.StoreCombinationDao">
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zbkj.crmeb.combination.dao.StorePinkDao">
|
||||
|
||||
</mapper>
|
||||
@@ -22,4 +22,24 @@
|
||||
ORDER BY ub.id DESC,ub.create_time DESC
|
||||
</select>
|
||||
|
||||
<select id="getListAdminAndIntegeal" resultType="com.zbkj.crmeb.user.response.UserBillResponse" parameterType="map">
|
||||
SELECT ub.id,ub.link_id AS linkId,ub.pm,ub.title,ub.category,ub.type,ub.number,ub.balance,ub.mark,ub.status,ub.create_time AS createTime,ub.update_time AS updateTime,u.nickname,ub.uid FROM eb_user_bill ub
|
||||
LEFT JOIN eb_user u ON ub.uid = u.uid
|
||||
where 1 = 1
|
||||
<if test="keywords != '' and keywords != null ">
|
||||
and ( ub.id like #{keywords} or ub.uid like #{keywords} or ub.link_id like #{keywords, jdbcType=VARCHAR} or ub.title like #{keywords, jdbcType=VARCHAR} or u.nickname like #{keywords, jdbcType=VARCHAR})
|
||||
</if>
|
||||
<if test="type != '' and type != null">
|
||||
and ub.type = #{type, jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="category != '' and category != null">
|
||||
and ub.category = #{category, jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="startTime != '' and endTime != '' and startTime != null and endTime != null">
|
||||
and (ub.create_time between #{startTime} and #{endTime})
|
||||
</if>
|
||||
|
||||
ORDER BY ub.id DESC,ub.create_time DESC
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user