zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-- 新版提交

Browse Source
This commit is contained in:
yc13649764453
2023-09-09 13:51:35 +08:00
parent 763e24b4e0
commit 0b193caa03
92 changed files with 3451 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/application-dev.yml
View File

@@ -4,7 +4,7 @@ spring:
druid:
driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://82.157.238.238:3309/e_book?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
url: jdbc:mysql://59.110.212.44:3306/e_book?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
url: jdbc:mysql://59.110.212.44:3306/book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
username: root
password: HSXY1234hsxy
initial-size: 10
@@ -75,4 +75,5 @@ aliyun:
# driver-class-name: org.postgresql.Driver
# url: jdbc:postgresql://localhost:5432/renren_security
# username: renren
# password: 123456

6
src/main/resources/application.yml
View File

@@ -7,6 +7,7 @@ server:
port: 9100
servlet:
context-path: /pb
connection-timeout: 6000000ms
spring:
# 环境 dev|test|prod
@@ -82,4 +83,7 @@ renren:
secret: f4e2e52034348f86b67cde581c0f9eb5[www.renren.io]
# token有效时长，7天，单位秒
expire: 604800
header: token
header: token
spring.jackson.serialization.FAIL_ON_EMPTY_BEANS: false

1
src/main/resources/mapper/book/BookBrowseRecordsDao.xml
View File

@@ -13,6 +13,7 @@
<result property="updateTime" column="update_time"/>
<result property="sort" column="sort"/>
<result property="delFlag" column="del_flag"/>
<result property="images" column="images"/>
</resultMap>

3
src/main/resources/mapper/book/BookDao.xml
View File

@@ -32,6 +32,9 @@
<result property="updateTime" column="update_time"/>
<result property="sort" column="sort"/>
<result property="delFlag" column="del_flag"/>
<result property="splits" column="splits"/>
<result property="canListen" column="can_listen"/>
<result property="clockIn" column="clock_in"/>
</resultMap>
<select id="queryBookInOther" resultType="com.peanut.modules.book.entity.BookEntity">

12
src/main/resources/mapper/book/MyUserDao.xml
View File

@@ -23,7 +23,19 @@
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
</resultMap>
<update id="update">
update user
<set>
age = #{age}, sex = #{sex} ,avatar=#{avatar} ,nickname =#{nickname}
</set>
where id = #{id}
</update>
</mapper>

2
src/main/resources/mapper/book/PayPaymentOrderDao.xml
View File

@@ -14,6 +14,8 @@
<result property="rechargeStatus" column="recharge_status"/>
<result property="createTime" column="create_time"/>
<result property="successTime" column="success_time"/>
<result property="userName" column="user_name"/>
<result property="tel" column="tel"/>
</resultMap>

2
src/main/resources/mapper/book/PayWechatOrderDao.xml
View File

@@ -15,6 +15,8 @@
<result property="payType" column="pay_type"/>
<result property="orderId" column="order_id"/>
<result property="buyOrderId" column="buy_order_id"/>
<result property="endtime" column="endtime"/>
</resultMap>

2
src/main/resources/mapper/book/ShopCategoryDao.xml
View File

@@ -14,6 +14,8 @@
<result property="icon" column="icon"/>
<result property="productUnit" column="product_unit"/>
<result property="productCount" column="product_count"/>
</resultMap>
</mapper>

18
src/main/resources/mapper/book/ShopProductDao.xml
View File

@@ -30,6 +30,15 @@
<result property="sumSales" column="sum_sales" />
<result property="goodsType" column="goods_type" />
<result property="goodsTypeCode" column="goods_type_code" />
<result property="activityPrice" column="activity_price" />
<result property="isFreeMail" column="is_free_mail" />
<result property="bookId" column="book_ids" />
<!-- <result property="bookidsimages" column="bookidsimages" />-->
<!-- <result property="bookids" column="book_ids" />-->
<!-- <result property="bookidsimages" column="bookidsimages" />-->
</resultMap>
@@ -39,10 +48,11 @@
FROM
`shop_product` a
LEFT JOIN shop_category b ON a.product_pid = b.cat_id
WHERE
<if test="catId != null and catId != ''">
b.cat_id = #{catId}
</if>
<where>
<if test="catId != null and catId != ''">
b.cat_id = #{catId}
</if>
</where>
order by a.sort desc
</select>

3
src/main/resources/mapper/book/TransactionDetailsDao.xml
View File

@@ -13,6 +13,9 @@
<result property="remark" column="remark"/>
<result property="userBalance" column="user_balance"/>
<result property="createTime" column="create_time"/>
<result property="userName" column="user_name"/>
<result property="tel" column="tel"/>
<result property="note" column="note"/>
</resultMap>

36
src/main/resources/weChatConfig.properties
View File

@@ -7,15 +7,43 @@ wxpay.mchId: 1612860909
wxpay.apiV3Key: 4aYFklzaULeGlr7oJPZ6rHWKcxjihZUF
# 微信支付V3-url前缀
wxpay.baseUrl: https://api.mch.weixin.qq.com/v3
#po9k1ezoyexk.ngrok.xiaomiqiu123.top 内网穿透地址 测试ok
wxpay.notifyUrl: http://po9k1ezoyexk.ngrok.xiaomiqiu123.top/pb/pay/payNotify
#po9k1ezoyexk.ngrok.xiaomiqiu123.top 内网穿透地址 测试ok 正式环境下切换服务器地址
#wxpay.notifyUrl: http://101.201.146.165:9100
wxpay.notifyUrl: http://59.110.212.44:9100/pb/pay/payNotify
# 退款通知回调, pjm6m9.natappfree.cc 为内网穿透地址
wxpay.refundNotifyUrl: http://pjm6m9.natappfree.cc/pay/refundNotify
# 密钥路径,resources下
wxpay.keyPemPath:C:\\Users\\Administrator\\IdeaProjects\\peanut_book\\src\\main\\resources\\cent\\apiclient_key.pem
# 密钥路径,resources下 /usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
wxpay.keyPemPath:C:/Users/Administrator/IdeaProjects/peanut_book/src/main/resources/cent/apiclient_key.pem
#商户证书序列号
wxpay.serialNo: 679AECB2F7AC4183033F713828892BA640E4EEE3
#微信服务器地址
wxpay.domain: https://api.mch.weixin.qq.com
#wxpay:
##应用编号
#wxpay.appId: wx47134a8f15083734
##商户号
#wxpay.mchId: 1612860909
## APIv3密钥
#wxpay.apiV3Key: 4aYFklzaULeGlr7oJPZ6rHWKcxjihZUF
## 微信支付V3-url前缀
#wxpay.baseUrl: https://api.mch.weixin.qq.com/v3
##po9k1ezoyexk.ngrok.xiaomiqiu123.top 内网穿透地址 测试ok 正式环境下切换服务器地址
#
##wxpay.notifyUrl: http://101.201.146.165:9100
#
#wxpay.notifyUrl: http://59.110.212.44:9100/pb/pay/payNotify
#
## 退款通知回调, pjm6m9.natappfree.cc 为内网穿透地址
#wxpay.refundNotifyUrl: http://pjm6m9.natappfree.cc/pay/refundNotify
## 密钥路径,resources下 /usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
#
#wxpay.keyPemPath:/usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
##商户证书序列号
#wxpay.serialNo: 679AECB2F7AC4183033F713828892BA640E4EEE3
##微信服务器地址
#wxpay.domain: https://api.mch.weixin.qq.com