Merge remote-tracking branch 'origin/develop/clock_in'

# Conflicts:
#	src/main/java/com/peanut/config/MyRedissonConfig.java

src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
   redis:
     open: false  # 是否开启redis缓存  true开启   false关闭
     database: 0
-    host: 39.106.36.183
+    host: 59.110.212.44
     port: 6379
     password: Jgll2015   # 密码（默认为空）
     timeout: 6000000ms  # 连接超时时长（毫秒）
@@ -70,4 +70,7 @@ aliyun:
     templateCode: SMS_248840040
 
 server:
-  port: 9200
+  port: 9200
+
+redisAddress: redis://59.110.212.44:6379
+redisPassword: Jgll2015

src/main/resources/application-prod.yml

@@ -69,4 +69,7 @@ aliyun:
     templateCode: SMS_248840040
 
 server:
-  port: 9100
+  port: 9100
+
+redisAddress: redis://59.110.212.44:6379
+redisPassword: Jgll2015

src/main/resources/mapper/book/OrderCartDao.xml

@@ -13,7 +13,7 @@
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
-        <result property="proudictBook" column="proudict_book"/>
+        <result property="productBook" column="product_book"/>
 
     </resultMap>
 

src/main/resources/mapper/book/UserRecordDao.xml

@@ -14,7 +14,7 @@
         <result property="orderCode" column="orderCode"/>
         <result property="orderSn" column="orderSn"/>
         <result property="starLevel" column="starLevel"/>
-        <result property="proudictId" column="proudict_id"/>
+        <result property="productId" column="product_id"/>
     </resultMap>