修整

src/main/java/com/shawn/web/controller/TEquipmentController.java

@@ -679,6 +679,7 @@ public class TEquipmentController extends BaseController<TEquipment, TEquipmentE
             if(param.getRule()!=""&&param.getRule()!=null){
                 equipment.setRule(param.getRule());
                 boolean b = tEquipmentService.updateById(equipment);
+                PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("updateRule", param.getRule()).toString());
                 if(b){
                     return ResponseEntity
                             .status(HttpStatus.OK)

src/main/java/com/shawn/web/controller/TOrderController.java

@@ -434,6 +434,19 @@ public class TOrderController extends BaseController<TOrder,TOrderExample,TOrder
 		order1.setPersonageId(personageId);
 		order1.setAdminId(admin.getId());
 		order1.setProductName(productName);
+		if(adminProportion!=null){
+			order1.setAdminProportion(Float.parseFloat(adminProportion.toString()));
+		}
+		if(agencyProportion!=null){
+			order1.setAgencyProportion(Float.parseFloat(agencyProportion.toString()));
+		}
+		if(merchantProportion!=null){
+			order1.setMerchantProportion(Float.parseFloat(merchantProportion.toString()));
+		}
+		if(personageProportion!=null){
+			order1.setPersonageProportion(Float.parseFloat(personageProportion.toString()));
+		}
+		order1.setAltInfo(altInfo.toString());
 		float p = Float.parseFloat(price1.toString());
 		order1.setPrice(p);
 		order1.setEquipmentId(equipmentId);

src/main/resources/application.properties

@@ -19,11 +19,13 @@ mybatis.type-aliases-package=com.shawn.model
 # swagger2 开关
 swagger.enable=true
 
-spring.datasource.username=hboxs
-spring.datasource.password=hboxs@mysql
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.url=jdbc:mysql://47.112.127.131:3306/clean_machine?characterEncoding=utf-8&useSSL=false
-
+spring.datasource.username=hboxs
+spring.datasource.password=hboxs@mysql
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/clean_machine?characterEncoding=utf-8&useSSL=false
+#spring.datasource.username=root
+#spring.datasource.password=123456
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.minimum-idle=10
 spring.datasource.hikari.maximum-pool-size=20