1111

db/.back_文明创办/.back_文明创办/文明创办-backup-2023511112401.pdma.json → db/.back_文明创办/.back_文明创办/文明创办-backup-2023525163727.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.1",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2023-5-11 10:30:13",
+  "updatedTime": "2023-5-11 16:31:13",
   "dbConns": [],
   "profile": {
     "default": {
@@ -3713,7 +3713,7 @@
         {
           "defKey": "source_type",
           "defName": "来源类型",
-          "comment": "feedback市民上报,issue模拟测评,dailySpe日常督查",
+          "comment": "feedback市民上报,check模拟测评",
           "type": "",
           "len": "",
           "scale": "",
@@ -3930,6 +3930,23 @@
           "extProps": {},
           "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
           "id": "1F85BFC4-DBF4-4BA5-9BD8-DC9C2BFA1646"
+        },
+        {
+          "defKey": "source_type2",
+          "defName": "问题来源PC",
+          "comment": "check 模拟测评  feedback 市民上报  inspector 督查员上报",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
+          "id": "42892AD2-FF8E-4D87-8705-14737E34AE9A"
         }
       ],
       "correlations": [],

src/main/java/com/example/civilizedcity/common/HttpUtils.java

@@ -1,87 +1,87 @@
-//package com.example.civilizedcity.common;
-//
-//import org.springframework.http.*;
-//import org.springframework.stereotype.Component;
-//import org.springframework.web.client.RestTemplate;
-//
-//import java.io.UnsupportedEncodingException;
-//import java.net.URLDecoder;
-//import java.util.*;
-//
-//@Component
-//public class HttpUtils {
-//    public String get(String url) throws Exception {
-//        RestTemplate restTemplate = new RestTemplate();
-//        HttpHeaders headers = new HttpHeaders();
-//        headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
-//        HttpEntity<String> entity = new HttpEntity<String>(headers);
-//
-//        Map<String, Object> urlAndParams = parseURL(url);
-//        String formatURL = (String) urlAndParams.get("url");
-//        Map<String, String> params = (Map<String, String>) urlAndParams.get("params");
-//
-//        ResponseEntity<String> resp = restTemplate.exchange(formatURL, HttpMethod.GET, entity, String.class, params);
-//        return resp.getBody();
-//    }
-//
-//    public String post(String url, Map<String, String> header, String body) throws Exception {
-//        RestTemplate restTemplate = new RestTemplate();
-//        HttpHeaders headers = new HttpHeaders();
-//        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
-//        headers.setContentType(type);
-//        headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
-//        headers.setAll(header);
-//        HttpEntity<String> entity = new HttpEntity<String>(body, headers);
-//
-//        Map<String, Object> urlAndParams = parseURL(url);
-//        String formatURL = (String) urlAndParams.get("url");
-//        Map<String, String> params = (Map<String, String>) urlAndParams.get("params");
-//
-//        ResponseEntity<String> resp = restTemplate.exchange(formatURL, HttpMethod.POST, entity, String.class, params);
-//        return resp.getBody();
-//    }
-//
-//    // RestTemplate 不能正常的处理 querystring, 必须按照约定的方式处理
-//    private Map<String, Object> parseURL(String url) {
-//        Map<String, Object> res = new HashMap<>();
-//
-//        String[] parts = url.split("\\?");
-//        String baseURL = parts[0];
-//
-//        if (parts.length < 2) {
-//            res.put("url", baseURL);
-//            res.put("params", new HashMap<>());
-//            return res;
-//        }
-//
-//
-//        String[] fields = parts[1].split("&");
-//        Map<String, String> params = new HashMap<>();
-//        List<String> searchList = new ArrayList<>();
-//        for (String field : fields) {
-//            String[] pairs = field.split("=");
-//            if (2 != pairs.length) {
-//                continue;
-//            }
-//
-//            try {
-//                String key = URLDecoder.decode(pairs[0].trim(), "UTF-8");
-//                String val = URLDecoder.decode(pairs[1].trim(), "UTF-8");
-//
-//                // 转化为 "foo={foo}" 这种字符串
-//                searchList.add(String.format("%s={%s}", key, key));
-//                // 把 foo 对应的值存储起来
-//                params.put(key, val);
-//            } catch (UnsupportedEncodingException e) {
-//                e.printStackTrace();
-//            }
-//        }
-//
-//        // url 格式类似 http://foo.org/bar?name={name}
-//        String formatURL = baseURL + "?" + String.join("&", searchList);
-//        res.put("url", formatURL);
-//        res.put("params", params);
-//
-//        return res;
-//    }
-//}
+package com.example.civilizedcity.common;
+
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.*;
+
+@Component
+public class HttpUtils {
+    public String get(String url) throws Exception {
+        RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders headers = new HttpHeaders();
+        headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
+        HttpEntity<String> entity = new HttpEntity<String>(headers);
+
+        Map<String, Object> urlAndParams = parseURL(url);
+        String formatURL = (String) urlAndParams.get("url");
+        Map<String, String> params = (Map<String, String>) urlAndParams.get("params");
+
+        ResponseEntity<String> resp = restTemplate.exchange(formatURL, HttpMethod.GET, entity, String.class, params);
+        return resp.getBody();
+    }
+
+    public String post(String url, Map<String, String> header, String body) throws Exception {
+        RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders headers = new HttpHeaders();
+        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
+        headers.setContentType(type);
+        headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
+        headers.setAll(header);
+        HttpEntity<String> entity = new HttpEntity<String>(body, headers);
+
+        Map<String, Object> urlAndParams = parseURL(url);
+        String formatURL = (String) urlAndParams.get("url");
+        Map<String, String> params = (Map<String, String>) urlAndParams.get("params");
+
+        ResponseEntity<String> resp = restTemplate.exchange(formatURL, HttpMethod.POST, entity, String.class, params);
+        return resp.getBody();
+    }
+
+    // RestTemplate 不能正常的处理 querystring, 必须按照约定的方式处理
+    private Map<String, Object> parseURL(String url) {
+        Map<String, Object> res = new HashMap<>();
+
+        String[] parts = url.split("\\?");
+        String baseURL = parts[0];
+
+        if (parts.length < 2) {
+            res.put("url", baseURL);
+            res.put("params", new HashMap<>());
+            return res;
+        }
+
+
+        String[] fields = parts[1].split("&");
+        Map<String, String> params = new HashMap<>();
+        List<String> searchList = new ArrayList<>();
+        for (String field : fields) {
+            String[] pairs = field.split("=");
+            if (2 != pairs.length) {
+                continue;
+            }
+
+            try {
+                String key = URLDecoder.decode(pairs[0].trim(), "UTF-8");
+                String val = URLDecoder.decode(pairs[1].trim(), "UTF-8");
+
+                // 转化为 "foo={foo}" 这种字符串
+                searchList.add(String.format("%s={%s}", key, key));
+                // 把 foo 对应的值存储起来
+                params.put(key, val);
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+        }
+
+        // url 格式类似 http://foo.org/bar?name={name}
+        String formatURL = baseURL + "?" + String.join("&", searchList);
+        res.put("url", formatURL);
+        res.put("params", params);
+
+        return res;
+    }
+}

src/main/java/com/example/civilizedcity/common/SMSCaptcha.java

@@ -0,0 +1,50 @@
+package com.example.civilizedcity.common;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.stereotype.Component;
+
+import java.util.Hashtable;
+
+@Slf4j
+@Component
+@EnableScheduling
+public class SMSCaptcha {
+
+    @Value("${sms.captcha.code}")
+    String code;
+    @Value("${sms.captcha.sign}")
+    String sign;
+
+    @Autowired
+    SMSUtils smsUtils;
+
+    /**
+     * 发送提醒短信
+     *
+     * @param tel
+     * @param captcha
+     * @throws Exception
+     */
+    public void send(String tel, String captcha) throws Exception {
+
+
+        SMSUtils.Message message = new SMSUtils.Message()
+                .setCode(code)
+                .setSign(sign)
+                .setTel(tel)
+                .setContent("{ \"status\": \"" + captcha + "\" }");
+
+        try {
+            smsUtils.sendMessage(message);
+        } catch (Exception e) {
+            e.printStackTrace();
+            // 修改友好点的错误
+            throw new Exception("发送验证码失败");
+        }
+
+    }
+}

src/main/java/com/example/civilizedcity/common/SMSUtils.java

@@ -1,65 +1,108 @@
-//package com.example.civilizedcity.common;
-//
+
+package com.example.civilizedcity.common;
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Component
+
+public class SMSUtils implements InitializingBean {
+    @Autowired
+    HttpUtils httpUtils;
+    @Value("${yz.sms.api}")
+    String smsAPI;
+
+    @Value("${yz.sms.appid}")
+    String appid;
+
+    public void sendMessage(Message message) throws Exception {
+        long nowMills = System.currentTimeMillis();
+        String timestamp = String.valueOf(nowMills);
+        String secret = appid + timestamp;
+
+        Map<String, String> header = new HashMap<>();
+        header.put("x-appid", appid);
+        header.put("x-timestamp", timestamp);
+        header.put("x-sign", EncryptUtils.md5(appid + secret, timestamp));
+
+        Map<String, String> body = new HashMap<>();
+        body.put("PhoneNumbers", message.getTel());
+        body.put("SignName", message.getSign());
+        body.put("TemplateCode", message.getCode());
+        body.put("TemplateParam", message.getContent());
+
+        httpUtils.post(smsAPI, header, JSONObject.toJSONString(body, false));
+
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Message {
+        String code;
+        String tel;
+        String sign;
+        String content;
+    }
+
+}
+
 //import com.alibaba.fastjson.JSONObject;
-//import lombok.Data;
-//import lombok.experimental.Accessors;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.factory.InitializingBean;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.scheduling.annotation.EnableAsync;
-//import org.springframework.scheduling.annotation.EnableScheduling;
-//import org.springframework.stereotype.Component;
+//import com.aliyuncs.CommonRequest;
+//import com.aliyuncs.CommonResponse;
+//import com.aliyuncs.DefaultAcsClient;
+//import com.aliyuncs.IAcsClient;
+//import com.aliyuncs.exceptions.ClientException;
+//import com.aliyuncs.http.MethodType;
+//import com.aliyuncs.profile.DefaultProfile;
+//import org.springframework.stereotype.Service;
 //
-//import java.util.HashMap;
 //import java.util.Map;
-//
-//@Slf4j
-//@Component
-//@EnableScheduling //开启定时任务
-//@EnableAsync  //开启多线程
-//public class SMSUtils implements InitializingBean {
-//    @Autowired
-//    HttpUtils httpUtils;
-//    @Value("${yz.sms.api}")
-//    String smsAPI;
-//
-//    @Value("${yz.sms.appid}")
-//    String appid;
-//
-//    //    @Async
+
+//@Service
+////@EnableScheduling //开启定时任务
+////@EnableAsync  //开启多线程
+//public class SMSUtils {
+//    //    @Override
+////    @Async
 ////    @Scheduled(cron = "0 30 8 * * ?") //时隔多少秒
-//    public void SendMessage(Message message) throws Exception {
-//        long nowMills = System.currentTimeMillis();
-//        String timestamp = String.valueOf(nowMills);
-//        String secret = appid + timestamp;
-//
-//        Map<String, String> header = new HashMap<>();
-//        header.put("x-appid", appid);
-//        header.put("x-timestamp", timestamp);
-//        header.put("x-sign", EncryptUtils.md5(appid + secret, timestamp));
-//
-//        Map<String, String> body = new HashMap<>();
-//        body.put("PhoneNumbers", message.getTel());
-//        body.put("SignName", message.getSign());
-//        body.put("TemplateCode", message.getCode());
-//        body.put("TemplateParam", message.getContent());
-//
-//        httpUtils.post(smsAPI, header, JSONObject.toJSONString(body, false));
-//
-//    }
-//
-//    @Override
-//    public void afterPropertiesSet() throws Exception {
-//    }
+//    public static void smsMessage(String phoneNumber, String TemplateCode, Map code) {  //AccessKey ID 账号 AccessKey secret密码
+//        DefaultProfile profile = DefaultProfile.getProfile("cn-nanjing", "LTAI4G16F251gw8zRaePUPQo", "你自己的密码");
+//        IAcsClient client = new DefaultAcsClient(profile);
+//        //阿里云原有的配置信息我们不需要改动
+//        CommonRequest request = new CommonRequest();
+//        request.setSysMethod(MethodType.POST);
+//        request.setSysDomain("dysmsapi.aliyuncs.com");
+//        request.setSysVersion("2017-05-25");
+//        request.setSysAction("SendSms");
+//        //自定义短信信息
+//        request.putQueryParameter("phoneNumber", phoneNumber); //发送给哪个手机号
+//        request.putQueryParameter("SignName", "清峰小栈");  //自己配置的短信签名
+//        request.putQueryParameter("TemplateCode", TemplateCode); //自己配置的模板 模版CODE
 //
-//    @Data
-//    @Accessors(chain = true)
-//    public static class Message {
-//        String code;
-//        String tel;
-//        String sign;
-//        String content;
+//        //构建一个短信验证码
+////        HashMap<String, Object> map = new HashMap<>();
+////        map.put("code", 8456);
+//        request.putQueryParameter("TemplateParam", JSONObject.toJSONString(code));   //转换成json字符串
+//        try {
+//            CommonResponse response = client.getCommonResponse(request); //发送至客户端
+//            System.out.println(response.getData());
+//        } catch (ClientException e) {
+//            e.printStackTrace();
+//        }
 //    }
 //
-//}
+//}

src/main/java/task/everyDayMessage.java

@@ -0,0 +1,18 @@
+package task;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+@EnableScheduling //开启定时任务
+@EnableAsync  //开启多线程
+public class everyDayMessage {
+
+    @Async
+    @Scheduled(cron = "0 30 8 * * ?") //时隔多少秒
+    public void remind() {
+
+
+
+
+    }
+}

src/main/resources/application.yml

@@ -14,6 +14,12 @@ spring:
   profiles:
     active: @profileActive@
 
+###
+sms:
+  captcha:
+    code: SMS 460785881
+    sign: 荟居
+
 ###
 yz:
   filter:
@@ -27,7 +33,12 @@ yz:
       - "/ma/captcha"
       - "/ma/change-password"
       - "/ma/auth-phone"
-
+  sms:
+    ##任意命名
+    appid:
+    api:
+    ## 帮助文档
+    help: http://sms.njyunzhi.com/help
 sa-token:
   # jwt秘钥
   jwt-secret-key: d4d778d279cf11ed9b1d525400e8554f