Merge remote-tracking branch 'origin/master'

apply-net/pom.xml

@@ -14,6 +14,11 @@
   <version>0.0.1</version>
   <version>0.0.1</version>
 
 
   <dependencies>
   <dependencies>
+    <dependency>
+      <groupId>com.winsun.framework</groupId>
+      <artifactId>winsun-core-message</artifactId>
+      <version>${winsun-framework.version}</version>
+    </dependency>
     <!-- 为了节省内存，改用jetty -->
     <!-- 为了节省内存，改用jetty -->
     <dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <groupId>org.springframework.boot</groupId>

apply-net/src/main/java/com/winsun/controller/PackageUpgradeController.java

+package com.winsun.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.winsun.auth.core.annotion.Permission;
+import com.winsun.auth.core.base.controller.BaseController;
+import com.winsun.auth.core.common.model.ResponseData;
+import com.winsun.bean.PackageUpgrade;
+import com.winsun.mapper.PackageUpgradeMapper;
+import com.winsun.utils.MessageUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @Author: chancy
+ * @Date: 2020/2/25 11:14
+ */
+@Slf4j
+@RestController
+@RequestMapping("/packageUpgrade")
+public class PackageUpgradeController extends BaseController {
+    private static PackageUpgradeMapper packageUpgradeMapper;
+
+    @Autowired
+    @Qualifier("redisStringTemplate")
+    private RedisTemplate redisTemplate;
+
+    @Autowired
+    public PackageUpgradeController(PackageUpgradeMapper packageUpgradeMapper) {
+        PackageUpgradeController.packageUpgradeMapper = packageUpgradeMapper;
+    }
+
+    @Permission(menuname = "发送验证码", value = "sendVerificationCode", method = RequestMethod.POST)
+    public ResponseData<String> sendVerificationCode(@RequestParam("selectOrder") String selectOrder) {
+        Wrapper<PackageUpgrade> wrapper = new EntityWrapper();
+        if(selectOrder.contains("@")){
+            wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr2", selectOrder);
+            List<Map<String,Object>> packageUpgrade=packageUpgradeMapper.selectPackage(wrapper);
+            String nbr = packageUpgrade.get(0).get("acc_nbr").toString();
+            String s = String.valueOf((int) ((Math.random() * 9 + 1) * 100000));
+            log.info("验证码:"+s);
+            //MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。");
+            redisTemplate.opsForValue().set(selectOrder,s,30, TimeUnit.MINUTES);
+            return ResponseData.success("已发送验证码到手机："+nbr.substring(0,3)+"****"+nbr.substring(7,11));
+        }
+        if(selectOrder.length() == 18){
+            wrapper.eq(StringUtils.isNotBlank(selectOrder), "social_id", selectOrder);
+            List<Map<String,Object>>  packageUpgrade=packageUpgradeMapper.selectPackage(wrapper);
+            String nbr = packageUpgrade.get(0).get("acc_nbr").toString();
+            String s = String.valueOf((int) ((Math.random() * 9 + 1) * 100000));
+            log.info("验证码:"+s);
+            //MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。");
+            redisTemplate.opsForValue().set(selectOrder,s,30, TimeUnit.MINUTES);
+            return ResponseData.success("已发送验证码到手机："+nbr.substring(0,3)+"****"+nbr.substring(7,11));
+        }
+        if(selectOrder.length() == 11){
+            wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr", selectOrder);
+            List<Map<String,Object>>  packageUpgrade=packageUpgradeMapper.selectPackage(wrapper);
+            String nbr = packageUpgrade.get(0).get("acc_nbr").toString();
+            String s = String.valueOf((int) ((Math.random() * 9 + 1) * 100000));
+            log.info("验证码:"+s);
+           // MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。");
+            redisTemplate.opsForValue().set(selectOrder,s,30, TimeUnit.MINUTES);
+            return ResponseData.success("已发送验证码到手机："+nbr.substring(0,3)+"****"+nbr.substring(7,11));
+        }
+        return ResponseData.error("当前查询条件有误！");
+    }
+
+    @Permission(menuname = "查询宽带信息", value = "selectPackage", method = RequestMethod.POST)
+    public ResponseData<List<Map<String,Object>>> selectPackage(@RequestParam("selectOrder") String selectOrder,@RequestParam("verificationCode") String verificationCode) {
+        if(redisTemplate.opsForValue().get(selectOrder).toString().equals(verificationCode)){
+        Wrapper<PackageUpgrade> wrapper = new EntityWrapper();
+        if(selectOrder.contains("@")){
+            wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr2", selectOrder);
+            List<Map<String,Object>> packageUpgrade=packageUpgradeMapper.selectPackage(wrapper);
+            return ResponseData.success(packageUpgrade);
+        }
+        if(selectOrder.length() == 18){
+            wrapper.eq(StringUtils.isNotBlank(selectOrder), "social_id", selectOrder);
+            List<Map<String,Object>>  packageUpgrade=packageUpgradeMapper.selectPackage(wrapper);
+            return ResponseData.success(packageUpgrade);
+        }
+        if(selectOrder.length() == 11){
+            wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr", selectOrder);
+            List<Map<String,Object>>  packageUpgrade=packageUpgradeMapper.selectPackage(wrapper);
+            return ResponseData.success(packageUpgrade);
+        }
+        }
+        return ResponseData.error("验证码有误！");
+    }
+}

apply-net/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ eureka:
     serviceUrl:
     serviceUrl:
       defaultZone: http://eureka:20000/eureka/
       defaultZone: http://eureka:20000/eureka/
 server:
 server:
-  port: 11091
+  port: 11092
   servlet:
   servlet:
     context-path: /ciop
     context-path: /ciop
   tomcat:
   tomcat:

apply-net/src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ eureka:
     serviceUrl:
     serviceUrl:
       defaultZone: http://eureka:20000/eureka/
       defaultZone: http://eureka:20000/eureka/
 server:
 server:
-  port: 11091
+  port: 11092
   servlet:
   servlet:
     context-path: /ciop
     context-path: /ciop
   tomcat:
   tomcat:

apply-net/src/main/resources/application.yml

@@ -10,7 +10,7 @@ eureka:
     serviceUrl:
     serviceUrl:
       defaultZone: http://localhost:20000/eureka/
       defaultZone: http://localhost:20000/eureka/
 server:
 server:
-  port: 11091
+  port: 11092
   servlet:
   servlet:
     context-path: /ciop
     context-path: /ciop
   tomcat:
   tomcat:
@@ -187,4 +187,12 @@ management:
     web:
     web:
       exposure:
       exposure:
         include: bus-refresh
         include: bus-refresh
+#发送短信账号
+message:
+  user: "jyyy"
+  pwd: "ll987!!ali5c8"
+  url: "https://fnsms.mini189.cn/smsapi"
+  phoneRule:
+    enabled: false
+    rule: "133, 149, 153, 173, 177, 180, 181, 189, 191, 199"