Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java

# Conflicts: # src/main/resources/weChatConfig.properties
2023-10-11 17:28:18 +08:00
parent 19e105b95e a356cceb62
commit f8b01d9aee
39 changed files with 864 additions and 834 deletions
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,60 +1,73 @@

 spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        druid:
-            driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://59.110.212.44:3306/e_book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-            username: root
-            password: HSXY1234hsxy
-            initial-size: 10
-            max-active: 100
-            min-idle: 10
-            max-wait: 60000
-            pool-prepared-statements: true
-            max-pool-prepared-statement-per-connection-size: 20
-            time-between-eviction-runs-millis: 60000
-            min-evictable-idle-time-millis: 300000
-            #Oracle需要打开注释
-            #validation-query: SELECT 1 FROM DUAL
-            test-while-idle: true
-            test-on-borrow: false
-            test-on-return: false
-            stat-view-servlet:
-                enabled: true
-                url-pattern: /druid/*
-                #login-username: admin
-                #login-password: admin
-            filter:
-                stat:
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: false
-                wall:
-                    config:
-                        multi-statement-allow: true
-        tomcat:
-            initSQL: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci
+  redis:
+    open: false  # 是否开启redis缓存  true开启   false关闭
+    database: 0
+    host: 39.106.36.183
+    port: 6379
+    password: Jgll2015   # 密码（默认为空）
+    timeout: 6000000ms  # 连接超时时长（毫秒）
+    jedis:
+      pool:
+        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
+        max-wait: -1ms      # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-idle: 10      # 连接池中的最大空闲连接
+        min-idle: 5       # 连接池中的最小空闲连接
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: jdbc:mysql://59.110.212.44:3306/e_book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+      username: root
+      password: HSXY1234hsxy
+      initial-size: 10
+      max-active: 100
+      min-idle: 10
+      max-wait: 60000
+      pool-prepared-statements: true
+      max-pool-prepared-statement-per-connection-size: 20
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      #Oracle需要打开注释
+      #validation-query: SELECT 1 FROM DUAL
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        #login-username: admin
+        #login-password: admin
+      filter:
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: false
+        wall:
+          config:
+            multi-statement-allow: true
+    tomcat:
+      initSQL: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci

-    rabbitmq:
-        host: 59.110.212.44
-        port: 5672
-        username: admin
-        password: 751019
-        virtualHost: /
+  rabbitmq:
+    host: 39.106.36.183
+    port: 5672
+    username: admin
+    password: 751019
+    virtualHost: /
 aliyun:
-    oss:
-        file:
-            endpoint: oss-cn-beijing.aliyuncs.com
-            keyid: LTAIiSMeo8ztauV5
-            keysecret: pVIYAOIFSUGg61lYfE8cjg2ZNpnLJA
-            bucketname: ehh-private-01
-    sms:
-        accessKeyId: LTAI5tJbbw5fY97pnw635yq3
-        accessKeySecret: LTXQ9v3OYVwNVbDWWfVpbbcVDKErKi
-        singName: 疯子读书
+  oss:
+    file:
+      endpoint: oss-cn-beijing.aliyuncs.com
+      keyid: LTAIiSMeo8ztauV5
+      keysecret: pVIYAOIFSUGg61lYfE8cjg2ZNpnLJA
+      bucketname: ehh-private-01
+  sms:
+    accessKeyId: LTAI5tJbbw5fY97pnw635yq3
+    accessKeySecret: LTXQ9v3OYVwNVbDWWfVpbbcVDKErKi
+    singName: 疯子读书

-        templateCode: SMS_248840040
+    templateCode: SMS_248840040

 server:
-    port: 9200
+  port: 9200
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,5 +1,18 @@

 spring:
+  redis:
+    open: false  # 是否开启redis缓存  true开启   false关闭
+    database: 0
+    host: 59.110.212.44
+    port: 6379
+    password: Jgll2015   # 密码（默认为空）
+    timeout: 6000000ms  # 连接超时时长（毫秒）
+    jedis:
+      pool:
+        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
+        max-wait: -1ms      # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-idle: 10      # 连接池中的最大空闲连接
+        min-idle: 5       # 连接池中的最小空闲连接
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    druid:
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,7 @@ connection-timeout: 6000000ms
 spring:
  # 环境 dev|test|prod
  profiles:
-    active: prod
+    active: dev
  # jackson时间格式化
  jackson:
    time-zone: GMT+8
@@ -21,19 +21,6 @@ spring:
      max-file-size: 100MB
      max-request-size: 100MB
      enabled: true
-  redis:
-    open: false  # 是否开启redis缓存  true开启   false关闭
-    database: 0
-    host: 59.110.212.44
-    port: 6379
-    password: Jgll2015   # 密码（默认为空）
-    timeout: 6000000ms  # 连接超时时长（毫秒）
-    jedis:
-      pool:
-        max-active: 1000  # 连接池最大连接数（使用负值表示没有限制）
-        max-wait: -1ms      # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-idle: 10      # 连接池中的最大空闲连接
-        min-idle: 5       # 连接池中的最小空闲连接
  mvc:
    throw-exception-if-no-handler-found: true
    pathmatch:
--- a/src/main/resources/mapper/book/BookClockinDao.xml
+++ b/src/main/resources/mapper/book/BookClockinDao.xml
@@ -8,7 +8,7 @@


    <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.peanut.modules.book.entity.BookClockinEntity" id="bookClockinMap">
+    <resultMap type="com.peanut.modules.book.entity.BookClockInEntity" id="bookClockinMap">
        <result property="id" column="id"/>
        <result property="bookId" column="book_id"/>
        <result property="userId" column="user_id"/>
--- a/src/main/resources/mapper/book/ShopProudictBookDao.xml
+++ b/src/main/resources/mapper/book/ShopProudictBookDao.xml
@@ -1,24 +1,25 @@
 <?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.peanut.modules.book.dao.ShopProudictBookDao">
+<mapper namespace="com.peanut.modules.book.dao.ShopProductBookDao">

    <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.peanut.modules.book.entity.ShopProudictBookEntity" id="ProudictBookMap">
+    <resultMap type="com.peanut.modules.book.entity.ShopProductBookEntity" id="ProductBookMap">
        <result property="id" column="id"/>
        <result property="createTime" column="create_time"/>
-        <result property="proudictId" column="proudict_id"/>
+        <result property="productId" column="product_id"/>
        <result property="delFlag" column="del_flag"/>
        <result property="bookId" column="book_id"/>
-        <result property="bookdIds" column="book_ids"/>
+        <result property="bookIds" column="book_ids"/>
    </resultMap>

    <select id="getOrderBookId" parameterType="string" resultType="int">
        SELECT spb.book_id
-        FROM shop_proudict_book spb
-                 LEFT JOIN buy_order_detail bod ON spb.proudict_id = bod.product_id
+        FROM shop_product_book spb
+                 LEFT JOIN buy_order_detail bod ON spb.product_id = bod.product_id
                 LEFT JOIN buy_order bo ON bo.order_id = bod.order_id
-        WHERE bo.order_sn = #{orderSn} AND spb.del_flag != -1
+        WHERE bo.order_sn = #{orderSn}
+          AND spb.del_flag != -1
    </select>