From 4692d04fffb8cf6a218d208521eaf8116d8fdf0b Mon Sep 17 00:00:00 2001
From: "lisai17@sina.com" <lisai17@sina.com>
Date: Thu, 8 Oct 2020 21:20:36 +0800
Subject: [PATCH] .

---
 .../local/ssjygl/ossfilelog/OssfileLogService.java    |  4 ++++
 .../src/main/resources/dev/config.properties          |  2 +-
 .../java/com/cowr/service/ssjygl/main/Config.java     |  4 ++++
 .../com/cowr/service/ssjygl/smslog/SmsService.java    | 11 +++++++++--
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ossfilelog/OssfileLogService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ossfilelog/OssfileLogService.java
index 93d74a4..d010dc2 100644
--- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ossfilelog/OssfileLogService.java
+++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/ossfilelog/OssfileLogService.java
@@ -58,6 +58,10 @@ public class OssfileLogService {
 
     public void checkUploadStatus(){
         List<OssfileLog> logs = OssfileLog.dao.find("select * from ossfile_log t where t.state = 0 limit 10");
+        if(logs.isEmpty()){
+            return;
+        }
+
         List<OssfileLog> ups = new ArrayList<>();
 
         log.debug("有 %s 张图片需要传到 oss", logs.size());
diff --git a/ssjygl-xsx-local/src/main/resources/dev/config.properties b/ssjygl-xsx-local/src/main/resources/dev/config.properties
index d362011..19aade4 100644
--- a/ssjygl-xsx-local/src/main/resources/dev/config.properties
+++ b/ssjygl-xsx-local/src/main/resources/dev/config.properties
@@ -15,7 +15,7 @@ socketserver.port=21002
 socketio.port=12002
 
 #当前部署本地程序的砂站id
-current.supermarket_id=1
+current.supermarket_id=6
 
 #打印用到的配置信息
 print.vendor=浠水县长投环保有限公司
diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java
index dd8c9cf..e074cb9 100644
--- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java
+++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java
@@ -284,6 +284,10 @@ public class Config extends JFinalConfig {
         }
     }
 
+    public static boolean isDev(){
+        return "dev".equals(ENV);
+    }
+
     /**
      * 判断当前是 开发 环境，还是 生产 环境
      * 根据不同的环境变量读取不同数据库连接
diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/smslog/SmsService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/smslog/SmsService.java
index d47f4f6..b0ff011 100644
--- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/smslog/SmsService.java
+++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/smslog/SmsService.java
@@ -9,6 +9,7 @@ import com.cowr.model.Ordercluster;
 import com.cowr.model.SmsLog;
 import com.cowr.model.Supermarket;
 import com.cowr.model.Sysuser;
+import com.cowr.service.ssjygl.main.Config;
 import com.cowr.service.ssjygl.main.SvrCacheData;
 import com.cowr.sms.AliyunSmsService;
 import com.jfinal.kit.StrKit;
@@ -96,8 +97,11 @@ public class SmsService {
 
         for (Sysuser sysuser : users) {
             try {
-//                String phone = sysuser.getPhone();
-                String phone = "13627293906";
+                String phone = sysuser.getPhone();
+
+                if(Config.isDev()){
+                    phone = "13627293906";
+                }
 
                 log.debug("给 %s 发送短信", phone);
 
@@ -143,6 +147,9 @@ public class SmsService {
 
     public void checkSendStatus() {
         List<SmsLog> logs = SmsLog.dao.find("select * from sms_log t where t.code = 'OK' and t.sendstatus < 2 limit 500");
+        if(logs.isEmpty()){
+            return;
+        }
 
         log.debug("检查 %s 短信发送状态", logs.size());