Merge remote-tracking branch 'origin/test' into test

src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java

@@ -242,6 +242,7 @@ public class PayController {
                               ){
 
 
+
         return payService.returnOrder(list,token,pwd, isOnline);
     }
 

src/main/java/com/chaozhanggui/system/cashierservice/service/DataService.java

@@ -273,6 +273,12 @@ public class DataService {
 
 
 
+                        JSONObject config = JSONObject.parseObject(it.getConfig());
+                        String model = config.getString("model");
+                        if(!"normal".equals(model)){
+                            log.error("打印机类型错误");
+                            return;
+                        }
                         List<HandoverInfo.PayInfo> list = null;
                         List<HandoverInfo.MemberData> memberData = null;
                         List<HandoverInfo.ProductCategory> productCategories = null;

src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ spring:
   application:
     name: cashierService
   datasource:
-    url: jdbc:mysql://101.37.12.135:3306/fycashier?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/fycashier_test?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
-    username: fycashier
+    username: cashier
-    password: Twc6MrzzjBiWSsjh
+    password: Cashier@1@
     driver-class-name: com.mysql.cj.jdbc.Driver
     initialSize: 5
     minIdle: 5

src/main/resources/application-pre.yml

@@ -1,10 +1,13 @@
+server:
+  port: 10589
 spring:
   application:
     name: cashierService
   datasource:
-    url: jdbc:mysql://121.40.128.145:3306/fycashier?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false
+    # 内网地址
-    username: root
+    url: jdbc:mysql://rm-bp1kn7h89nz62cno1.mysql.rds.aliyuncs.com:3306/fycashier_pre?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
-    password: mysqlroot@123
+    username: cashier
+    password: Cashier@1@
     driver-class-name: com.mysql.cj.jdbc.Driver
     initialSize: 5
     minIdle: 5
@@ -12,12 +15,12 @@ spring:
     maxWait: 60000
   logging:
     level:
-      com.chaozhanggui.system.openness: debug
+      com.chaozhanggui.system.openness: info
   redis:
     # redis数据库索引（默认为0），我们使用索引为3的数据库，避免和其他数据库冲突
-    database: 2
+    database: 0
     # redis服务器地址（默认为localhost）
-    host: 101.37.12.135
+    host: localhost
     # redis端口（默认为6379）
     port: 6379
     # redis访问密码（默认为空）
@@ -35,7 +38,7 @@ spring:
   main:
     allow-circular-references: true
   rabbitmq:
-    host: 127.0.0.1
+    host: localhost
     port: 5672
     username: admin
     password: Czg666888
@@ -45,12 +48,14 @@ pagehelper:
   reasonable: true
   helperDialect: mysql
   params: count=countSql
-
 mybatis:
   configuration:
     map-underscore-to-camel-case: true
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   mapper-locations: classpath:mapper/*.xml
+subscribe:
+  message:
+    miniprogramState: trial