diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java index 73186782..f87c4810 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/alipay/AlipayController.java @@ -16,6 +16,7 @@ import net.lab1024.smartadmin.module.system.alipay.conf.AlipayConfig; import net.lab1024.smartadmin.module.system.qrcode.QRCodeUtil; import net.lab1024.smartadmin.module.system.royalcanin.good.service.GoodService; import net.lab1024.smartadmin.util.GenerateSequenceUtil; +import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -202,4 +203,21 @@ public class AlipayController { return "success"; } + + + public static void main(String[] args){ + String[] a = { "/bin/sh", "-c","iptables -nvL --line"}; + process1(a); + } + public static void process1(String[] cmdarray) { + try { + final Process p = Runtime.getRuntime().exec(cmdarray); + String info = IOUtils.toString(p.getInputStream()); + String error = IOUtils.toString(p.getErrorStream()); + System.err.println(info); + } catch (Exception e) { + e.printStackTrace(); + } + } + } diff --git a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql index 3ad89b38..fcd9bed6 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql +++ b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql @@ -1631,7 +1631,7 @@ PRIMARY KEY (`id`) CREATE TABLE `t_good_orders` ( `id` int(11) NOT NULL AUTO_INCREMENT, `order_no` varchar(20) DEFAULT NULL COMMENT '订单号', -`order_status` varchar(20) DEFAULT NULL COMMENT '订单状态\r\n 10:待付款\r\n 20:已付款', +`order_status` varchar(20) DEFAULT NULL COMMENT '0:待付款,1:待收货,2:已完成,3:已取消,4:异常订单', `order_amount` varchar(11) DEFAULT NULL COMMENT '订单金额', `pay_amount` varchar(11) DEFAULT NULL COMMENT '实际支付金额', `product_id` varchar(20) DEFAULT NULL COMMENT '产品表外键ID',