jiazhizhong/crmeb_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

全新UI视觉体验，移动端API优化降低重复调用，提高并发6倍，修复N多Bug

Browse Source
This commit is contained in:
stivepeim
2021-06-11 17:41:16 +08:00
parent 0b9f28fa52
commit b76840e10f
582 changed files with 35633 additions and 28276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crmeb/src/main/resources/application-beta.yml
View File

@@ -2,7 +2,7 @@
server:
port: 20001
domain: #配合swagger使用 # 待部署域名
version: CRMEB-JAVA-v1.3.3 # 当前代码版本
version: CRMEB-JAVA-KY-v1.3.3.1 # 当前代码版本
wechat-api-url:
asyncConfig: false
asyncWeChatProgramTempList: false
@@ -15,13 +15,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?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: root
password: password
url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: roor
password: 123456
redis:
host: 127.0.0.1 #地址
port: 6379 #端口
password: password
password: 123456
timeout: 1000 # 连接超时时间（毫秒）
database: 0 #默认数据库
jedis:

10
crmeb/src/main/resources/application-dev.yml
View File

@@ -2,7 +2,7 @@
server:
port: 20002
domain: #配合swagger使用 # 待部署域名
version: CRMEB-JAVA-v1.3.3 # 当前代码版本
version: CRMEB-JAVA-KY-v1.3.3.1 # 当前代码版本
wechat-api-url:
asyncConfig: false
asyncWeChatProgramTempList: false
@@ -15,15 +15,15 @@ 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?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
url: jdbc:mysql://127.0.0.1:3306/crmeb_java_dev?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: root
password: password
password: 123456
redis:
host: 127.0.0.1 #地址
port: 6379 #端口
password: password
password: 123456
timeout: 1000 # 连接超时时间（毫秒）
database: 0 #默认数据库
database: 10 #默认数据库
jedis:
pool:
max-active: 200 # 连接池最大连接数（使用负值表示没有限制）

12
crmeb/src/main/resources/application-prod.yml
View File

@@ -1,8 +1,8 @@
# 配置端口
server:
port: 20000
domain: #配合swagger使用 # 待部署域名
version: CRMEB-JAVA-v1.3.3 # 当前代码版本
domain: api.java.crmeb.net #配合swagger使用 # 待部署域名
version: CRMEB-JAVA-KY-v1.3.3.1 # 当前代码版本
wechat-api-url:
wechat-js-api-debug: false
wechat-js-api-beta: false
@@ -19,13 +19,13 @@ spring:
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/crmeb_java?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: root
password: password
password: 123456
redis:
host: 127.0.0.1 #地址
port: 6379 #端口
password: password
password: 123456
timeout: 1000 # 连接超时时间（毫秒）
database: 0 #默认数据库
database: 15 #默认数据库
jedis:
pool:
max-active: 200 # 连接池最大连接数（使用负值表示没有限制）
@@ -56,4 +56,4 @@ swagger:
enable: true #是否开启界面
check: true #是否打开验证
username: crmeb #访问swagger的账号
password: ZeypRDYBfM #访问swagger的密码
password: 123456 #访问swagger的密码

14
crmeb/src/main/resources/application.yml
View File

@@ -2,8 +2,8 @@
server:
port: 8080
domain: #配合swagger使用 # 待部署域名
version: CRMEB-JAVA-v1.3.3 # 当前代码版本
wechat-api-url: #请求微信接口中专服务器 仅仅调试时使用
version: CRMEB-JAVA-KY-v1.3.3.1 # 当前代码版本
wechat-api-url: #请求微信接口中专服务器
wechat-js-api-debug: false #微信js api系列是否开启调试模式
wechat-js-api-beta: true #微信js api是否是beta版本
asyncConfig: false #是否同步config表数据到redis
@@ -31,15 +31,15 @@ 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?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
url: jdbc:mysql://127.0.0.1:3306/crmeb_java_cn?characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
username: root
password: password
password: 123456
redis:
host: 127.0.0.1 #地址
port: 6379 #端口
password: password
timeout: 1000 # 连接超时时间（毫秒）
database: 0 #默认数据库
password: 123456
timeout: 30000 # 连接超时时间（毫秒）
database: 3 #默认数据库
jedis:
pool:
max-active: 200 # 连接池最大连接数（使用负值表示没有限制）

108
crmeb/src/main/resources/logback-spring.xml
View File

@@ -28,21 +28,20 @@
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!-- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} -%5p ${PID:-} [%class:%line] : %msg%n</pattern>
<!-- <pattern>-->
<!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
<pattern>
<!-- <pattern>-->
<!-- {-->
<!-- "app": "${APP_NAME}",-->
<!-- "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",-->
<!-- "level": "%level",-->
<!-- "thread": "%thread",-->
<!-- "class": "%logger{40}",-->
<!-- "message": "%msg" }-->
<!-- %n-->
<!-- </pattern>-->
<!-- </pattern>-->
<pattern>
{
"app": "${APP_NAME}",
"timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
"level": "%level",
"thread": "%thread",
"class": "%logger{40}",
"message": "%msg" }
%n
</pattern>
</pattern>
<charset>utf-8</charset>
</encoder>
</appender>
@@ -100,20 +99,19 @@
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} -%5p ${PID:-} [%class:%line] : %msg%n</pattern>
<!-- <pattern>-->
<pattern>
<!-- <pattern>-->
<!-- {-->
<!-- "app": "${APP_NAME}",-->
<!-- "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",-->
<!-- "level": "%level",-->
<!-- "thread": "%thread",-->
<!-- "class": "%logger{40}",-->
<!-- "message": "%msg" }-->
<!-- %n-->
<!-- </pattern>-->
<!-- </pattern>-->
<pattern>
{
"app": "${APP_NAME}",
"timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
"level": "%level",
"thread": "%thread",
"class": "%logger{40}",
"message": "%msg" }
%n
</pattern>
</pattern>
<charset>utf-8</charset>
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
@@ -142,20 +140,19 @@
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} -%5p ${PID:-} [%class:%line] : %msg%n</pattern>
<!-- <pattern>-->
<pattern>
<!-- <pattern>-->
<!-- {-->
<!-- "app": "${APP_NAME}",-->
<!-- "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",-->
<!-- "level": "%level",-->
<!-- "thread": "%thread",-->
<!-- "class": "%logger{40}",-->
<!-- "message": "%msg" }-->
<!-- %n-->
<!-- </pattern>-->
<!-- </pattern>-->
<pattern>
{
"app": "${APP_NAME}",
"timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
"level": "%level",
"thread": "%thread",
"class": "%logger{40}",
"message": "%msg" }
%n
</pattern>
</pattern>
<charset>utf-8</charset>
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
@@ -184,20 +181,19 @@
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!--<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>-->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} -%5p ${PID:-} [%class:%line] : %msg%n</pattern>
<!-- <pattern>-->
<pattern>
<!-- <pattern>-->
<!-- {-->
<!-- "app": "${APP_NAME}",-->
<!-- "timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",-->
<!-- "level": "%level",-->
<!-- "thread": "%thread",-->
<!-- "class": "%logger{40}",-->
<!-- "message": "%msg" }-->
<!-- %n-->
<!-- </pattern>-->
<!-- </pattern>-->
<pattern>
{
"app": "${APP_NAME}",
"timestamp":"%d{yyyy-MM-dd HH:mm:ss.SSS}",
"level": "%level",
"thread": "%thread",
"class": "%logger{40}",
"message": "%msg" }
%n
</pattern>
</pattern>
<charset>utf-8</charset>
</encoder>
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
@@ -228,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>

6
crmeb/src/main/resources/mapper/finance/UserFundsMonitorMapper.xml
View File

@@ -4,9 +4,11 @@
<select id="getFundsMonitor" resultType="com.zbkj.crmeb.finance.model.UserFundsMonitor" parameterType="map">
SELECT u.uid, u.nickname, u.now_money, u.brokerage_price AS brokerage,u.create_time,u.spread_uid,
IF(( Sum(b.price) ) IS NULL, 0.00, Sum(b.price)) AS total_brokerage,
IF(( Sum(e.extract_price) ) IS NULL, 0.00, Sum(e.extract_price)) AS total_extract FROM eb_user AS u
-- IF(( Sum(e.extract_price) ) IS NULL, 0.00, Sum(e.extract_price)) AS total_extract
(SELECT if(Sum( e.extract_price ) IS NULL, 0.00, Sum( e.extract_price ) ) from eb_user_extract e where e.uid = u.uid and e.`status` = 1 ) AS total_extract
FROM eb_user AS u
LEFT JOIN eb_user_brokerage_record AS b ON u.uid = b.uid AND b.link_type = 'order' AND b.`type` = 1 AND b.`status` = 3
LEFT JOIN eb_user_extract AS e ON u.`uid` = e.uid AND e.STATUS = 1
-- LEFT JOIN eb_user_extract AS e ON u.`uid` = e.uid AND e.STATUS = 1
where 1 = 1
<if test="keywords != '' and keywords != null ">
and ( u.uid like #{keywords} or u.nickname like #{keywords, jdbcType=VARCHAR})

5
crmeb/src/main/resources/mapper/pay/component/PayComponentBrandMapper.xml Normal file
View File

@@ -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.payComponent.brand.dao.PayComponentBrandDao">
</mapper>

5
crmeb/src/main/resources/mapper/pay/component/PayComponentCatMapper.xml Normal file
View File

@@ -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.payComponent.cat.dao.PayComponentCatDao">
</mapper>

5
crmeb/src/main/resources/mapper/pay/component/PayComponentDraftProductMapper.xml Normal file
View File

@@ -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.payComponent.product.dao.PayComponentDraftProductDao">
</mapper>

5
crmeb/src/main/resources/mapper/pay/component/PayComponentProductAuditInfoMapper.xml Normal file
View File

@@ -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.payComponent.product.dao.PayComponentProductAuditInfoDao">
</mapper>

5
crmeb/src/main/resources/mapper/pay/component/PayComponentProductInfoMapper.xml Normal file
View File

@@ -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.payComponent.product.dao.PayComponentProductInfoDao">
</mapper>

5
crmeb/src/main/resources/mapper/pay/component/PayComponentProductMapper.xml Normal file
View File

@@ -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.payComponent.product.dao.PayComponentProductDao">
</mapper>

5
crmeb/src/main/resources/mapper/pay/component/PayComponentProductSkuAttrMapper.xml Normal file
View File

@@ -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.payComponent.product.dao.PayComponentProductSkuAttrDao">
</mapper>

5
crmeb/src/main/resources/mapper/pay/component/PayComponentProductSkuMapper.xml Normal file
View File

@@ -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.payComponent.product.dao.PayComponentProductSkuDao">
</mapper>

12
crmeb/src/main/resources/mapper/store/StoreProductRelationMapper.xml
View File

@@ -1,5 +1,15 @@
<?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.store.dao.StoreProductRelationDao">
<select id="getUserList" resultType="com.zbkj.crmeb.front.response.UserRelationResponse" parameterType="java.lang.Integer">
-- SELECT r.id,r.product_id as productId,r.create_time as createTime,p.store_name as storeName,p.image,p.price
SELECT r.id,r.product_id,r.create_time,p.store_name,p.image,p.price
FROM eb_store_product_relation r
INNER JOIN eb_store_product p ON r.product_id = p.id And p.is_show = 1
where r.`type` = 'collect'
<if test="uid != '' and type != null">
and r.uid = #{uid}
</if>
ORDER BY r.id DESC
</select>
</mapper>

5
crmeb/src/main/resources/mapper/user/UserIntegralRecordMapper.xml Normal file
View File

@@ -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.record.dao.UserIntegralRecordDao">
</mapper>

66
crmeb/src/main/resources/mapper/user/UserMapper.xml
View File

@@ -6,7 +6,7 @@
</update>
<select id="getSpreadPeopleList" resultType="com.zbkj.crmeb.front.response.UserSpreadPeopleItemResponse" parameterType="map">
SELECT u.nickname, u.avatar, DATE_FORMAT(u.create_time, '%Y-%m-%d %H:%i:%s') AS `time`, u.spread_count AS childCount, u.pay_count AS orderCount, p.numberCount AS numberCount FROM eb_user AS u
SELECT u.nickname, u.avatar, DATE_FORMAT(u.spread_time, '%Y-%m-%d %H:%i:%s') AS `time`, u.spread_count AS childCount, u.pay_count AS orderCount, p.numberCount AS numberCount FROM eb_user AS u
LEFT JOIN (
SELECT IF((sum(pay_price) = NULL), 0.00, sum(pay_price)) AS numberCount, o.uid as o_uid FROM eb_store_order as o WHERE is_del = 0 AND is_system_del = 0
<if test="userIdList != null and userIdList !='' ">
@@ -22,4 +22,68 @@
</if>
ORDER BY ${sortKey} ${sortValue}
</select>
<select id="findAdminList" resultType="com.zbkj.crmeb.user.model.User" parameterType="Map">
SELECT u.* FROM eb_user AS u
<if test='userType != null and userType != "" and userType == "wechat"'>
INNER JOIN eb_user_token AS ut on u.uid = ut.uid and ut.type = 1
</if>
<if test='userType != null and userType != "" and userType == "routine"'>
INNER JOIN eb_user_token AS ut on u.uid = ut.uid and ut.type = 2
</if>
where 1 = 1
<if test="isPromoter != null and isPromoter !='' or isPromoter == 0 ">
and u.is_promoter = ${isPromoter}
</if>
<if test="groupId != null and groupId !='' ">
and u.group_id in (${groupId})
</if>
<if test="tagIdSql != null and tagIdSql !='' ">
and ${tagIdSql}
</if>
<if test="level != null and level !='' ">
and u.level in (${level})
</if>
<if test="sex != null and sex !='' or sex == 0">
and u.sex = ${sex}
</if>
<if test="country != null and country !='' ">
and u.country = #{country}
</if>
<if test="addres != null and addres !='' ">
and u.addres like '%${addres}'
</if>
<if test="payCount != null and payCount !='' or payCount == 0 ">
<if test="payCount &lt;= 0">
and u.pay_count = 0
</if>
<if test="payCount > 0">
and u.pay_count >= ${payCount}
</if>
</if>
<if test="status != null and status !='' or status == 0 ">
and u.`status` = ${status}
</if>
<if test="startTime != null and startTime != '' and accessType != null and accessType != ''">
<choose>
<when test="accessType = 1">
and create_time between #{startTime} and #{endTime}
and create_time = last_login_time
</when>
<when test="accessType = 2">
and last_login_time between #{startTime} and #{endTime}
</when>
<when test="accessType = 3">
and last_login_time not between #{startTime} and #{endTime}
</when>
<otherwise>
and create_time between #{startTime} and #{endTime}
</otherwise>
</choose>
</if>
<if test="keywords != '' and keywords != null ">
and ( u.phone like #{keywords, jdbcType=VARCHAR} or u.nickname like "%"#{keywords, jdbcType=VARCHAR}"%" or u.mark like #{keywords, jdbcType=VARCHAR})
</if>
ORDER BY u.uid desc
</select>
</mapper>