diff --git a/domain/pom.xml b/domain/pom.xml deleted file mode 100755 index f7442eb..0000000 --- a/domain/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - 4.0.0 - - com.xiang - xservice-scirpt - 1.0-SNAPSHOT - - - domain - - - 8 - 8 - UTF-8 - - - - - - com.xiang - facade - 1.0-SNAPSHOT - - - - com.aliyun - alidns20150109 - 3.4.7 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.3.0.RELEASE - - exec - - com.xiang.DomainApplication - ZIP - - - - - repackage - - - - - - - - \ No newline at end of file diff --git a/domain/src/main/java/com/xiang/DomainApplication.java b/domain/src/main/java/com/xiang/DomainApplication.java deleted file mode 100755 index b6351bc..0000000 --- a/domain/src/main/java/com/xiang/DomainApplication.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.xiang; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.scheduling.annotation.EnableScheduling; - -/** - * @Author: xiang - * @Date: 2025-06-10 16:43 - */ -@SpringBootApplication -@EnableScheduling -public class DomainApplication { - public static void main(String[] args) { - SpringApplication.run(DomainApplication.class, args); - } -} \ No newline at end of file diff --git a/domain/src/main/java/com/xiang/common/Result.java b/domain/src/main/java/com/xiang/common/Result.java deleted file mode 100755 index 304b435..0000000 --- a/domain/src/main/java/com/xiang/common/Result.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.xiang.common; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Collections; -import java.util.List; - -/** - * @Author: xiang - * @Date: 2025-05-09 14:09 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class Result { - - private String code; - - private String message; - - private List data; - - public static Result success(String message) { - return new Result("200", message, null); - } - - - public static Result success(String message, List data) { - return new Result("200", message, data); - } - public static Result success(String message, T data) { - return new Result("200", message, Collections.singletonList(data)); - } - - public static Result error(String message) { - return new Result("500", message, null); - } - - public static Result error(String message, T data) { - return new Result("500", message, Collections.singletonList(data)); - } - public static Result error(String message, List data) { - return new Result("500", message, data); - } - - public static Result error(String code, String message) { - return new Result(code, message, null); - } -} diff --git a/domain/src/main/java/com/xiang/utils/HttpUtils.java b/domain/src/main/java/com/xiang/utils/HttpUtils.java deleted file mode 100755 index 3023740..0000000 --- a/domain/src/main/java/com/xiang/utils/HttpUtils.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.xiang.utils; - -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.MapUtils; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; - -import java.io.Closeable; -import java.io.IOException; -import java.util.Map; -import java.util.Set; - -/** - * @Author: xiang - * @Date: 2025-05-08 14:39 - */ -@Slf4j -public class HttpUtils { - - private final static int socketTimeOut = 60 * 1000; - private final static int connectTimeout = 60 * 1000; - private final static int connectionRequestTimeout = 15 * 1000; - private final static int defaultMaxPerRoute = 500; - private final static int maxTotal = 2000; - - public static String doPost(String url, Map header, String jsonParams) { - RequestConfig requestConfig = RequestConfig.custom() - // 设置连接超时时间 - .setConnectTimeout(connectTimeout) - // 设置Socket超时时间 - .setSocketTimeout(socketTimeOut) - .setConnectionRequestTimeout(connectionRequestTimeout) - .build(); - //创建httpClient对象 - CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig).build(); - CloseableHttpResponse response = null; - String result = ""; - try { - // 创建http请求 - HttpPost httpPost = new HttpPost(url); - httpPost.addHeader("Content-Type", "application/json"); - // 创建请求内容 - StringEntity entity = new StringEntity(jsonParams, "utf-8"); - entity.setContentType("application/json"); - httpPost.setEntity(entity); - // 设置请求头 - if (null != header && !header.isEmpty()) { - Set> entries = header.entrySet(); - for (Map.Entry e : entries) { - httpPost.setHeader(e.getKey(), e.getValue()); - } - } - response = httpClient.execute(httpPost); - result = EntityUtils.toString(response.getEntity(), "utf-8"); - } catch (Exception e) { - log.error("doPost异常", e); - } finally { - //关闭资源 - closeResource(response, httpClient); - } - return result; - } - - public static String doGet(String url, Map header, Map param) { - RequestConfig requestConfig = RequestConfig.custom() - // 设置连接超时时间 - .setConnectTimeout(connectTimeout) - // 设置Socket超时时间 - .setSocketTimeout(socketTimeOut) - .setConnectionRequestTimeout(connectionRequestTimeout) - .build(); - CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig).build(); - CloseableHttpResponse response; - String result = ""; - try { - String request = ""; - if (MapUtils.isNotEmpty(param)) { - StringBuilder req = new StringBuilder("?"); - for (Map.Entry entry : param.entrySet()) { - req.append(entry.getKey()).append("=").append(entry.getValue()).append("&"); - } - request = req.substring(0, req.length() - 1); - } - - HttpGet httpGet = new HttpGet(url + request); - httpGet.addHeader("Content-Type", "application/json"); - if (MapUtils.isNotEmpty(header)) { - for (Map.Entry entry : header.entrySet()) { - httpGet.setHeader(entry.getKey(), entry.getValue()); - } - } - log.info("doGet请求：请求地址：{}", url + request); - response = httpClient.execute(httpGet); - result = EntityUtils.toString(response.getEntity(), "utf-8"); - } catch (Exception e) { - log.error("doGet异常：", e); - } - return result; - } - - /** - * @Description 关闭资源 - */ - private static void closeResource(Closeable... resources) { - try { - for (Closeable resource : resources) { - if (resource != null) { - resource.close(); - } - } - } catch (IOException e) { - e.printStackTrace(); - } - } -} diff --git a/domain/src/main/java/com/xiang/utils/IpUtils.java b/domain/src/main/java/com/xiang/utils/IpUtils.java deleted file mode 100755 index d5febc5..0000000 --- a/domain/src/main/java/com/xiang/utils/IpUtils.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.xiang.utils; - -import com.google.common.collect.Maps; - -import java.io.IOException; -import java.util.Map; - -/** - * @Author: xiang - * @Date: 2025-06-10 16:50 - */ -public class IpUtils { - - private final static String PUBLIC_IP_URL = "https://api-ipv4.ip.sb/ip"; - - public static String getPublicIp() throws IOException { - - Map header = Maps.newHashMap(); - header.put("User-Agent", "Mozilla/5.0"); - return HttpUtils.doGet(PUBLIC_IP_URL, header, null).trim(); - } -} diff --git a/domain/src/main/resources/application-local.yml b/domain/src/main/resources/application-local.yml deleted file mode 100755 index e2ad775..0000000 --- a/domain/src/main/resources/application-local.yml +++ /dev/null @@ -1,10 +0,0 @@ -spring: - datasource: - url: jdbc:mysql:///xservice-script?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true - username: root - password: 123456 - driver-class-name: com.mysql.cj.jdbc.Driver - -aliyun: - dns: - RR: test21 \ No newline at end of file diff --git a/domain/src/main/resources/application-nas.yml b/domain/src/main/resources/application-nas.yml deleted file mode 100755 index 23b4044..0000000 --- a/domain/src/main/resources/application-nas.yml +++ /dev/null @@ -1,10 +0,0 @@ -spring: - datasource: - url: jdbc:mysql://172.28.159.213:3306/xservice-script?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true - username: root - password: 123456 - driver-class-name: com.mysql.cj.jdbc.Driver - -aliyun: - dns: - RR: client \ No newline at end of file diff --git a/domain/src/main/resources/application-prod.yml b/domain/src/main/resources/application-prod.yml deleted file mode 100755 index 7a478f3..0000000 --- a/domain/src/main/resources/application-prod.yml +++ /dev/null @@ -1,10 +0,0 @@ -spring: - datasource: - url: jdbc:mysql://172.28.159.213:3306/xservice-script?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true - username: root - password: 123456 - driver-class-name: com.mysql.cj.jdbc.Driver - -aliyun: - dns: - RR: general \ No newline at end of file diff --git a/domain/src/main/resources/application.yml b/domain/src/main/resources/application.yml deleted file mode 100755 index 8732c39..0000000 --- a/domain/src/main/resources/application.yml +++ /dev/null @@ -1,18 +0,0 @@ -mybatis: - mapper-locations: - - classpath*:mapper/*.xml - configuration: - map-underscore-to-camel-case: true - -DingTalk: - # 钉钉消息用户，用逗号隔开 - userList: "450841600726084717" - # 钉钉消息群ID，需要调用/chat/create api创建群返回 - chatId: "chatd16d8daeea33b36b73588c676d508096" - -server: - port: 8080 - -spring: - profiles: - active: local \ No newline at end of file diff --git a/domain/src/main/resources/logback-spring.xml b/domain/src/main/resources/logback-spring.xml deleted file mode 100755 index d222df7..0000000 --- a/domain/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - ${APP_NAME} - - - - - - - - - - - - - - %boldGreen(%contextName): %boldCyan(%d{yyyy-MM-dd HH:mm:ss:SSS}) %highlight([%c]) %boldMagenta([%t]) %boldCyan([%L]) %highlight([traceId:%X{traceId:-},spanId:%X{spanId:-},localIp:%X{localIp:-}]) %boldGreen([%p]) - %msg%n - - - UTF-8 - - - - - - - - ${LOG_HOME}/debug-%d{yyyy-MM-dd}.log - - ${LOG_MAX_HISTORY} - - - - %contextName: %d{yyyy-MM-dd HH:mm:ss.SSS} [%c][%t][%L][%p] [traceId:%X{traceId:-},spanId:%X{spanId:-},localIp:%X{localIp:-}] - %msg%n - UTF-8 - - - - debug - ACCEPT - DENY - - - - - - - - ${LOG_HOME}/info-%d{yyyy-MM-dd}.log - - ${LOG_MAX_HISTORY} - - - - %contextName: %d{yyyy-MM-dd HH:mm:ss.SSS} [%c][%t][%L][%p] [traceId:%X{traceId:-},spanId:%X{spanId:-},localIp:%X{localIp:-}] - %msg%n - UTF-8 - - - - - info - ACCEPT - DENY - - - - - - - - ${LOG_HOME}/error-%d{yyyy-MM-dd}.log - - ${LOG_MAX_HISTORY} - - - - %contextName: %d{yyyy-MM-dd HH:mm:ss.SSS} [%c][%t][%L][%p] [traceId:%X{traceId:-},spanId:%X{spanId:-},localIp:%X{localIp:-}] - %msg%n - UTF-8 - - - - error - ACCEPT - DENY - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/facade/pom.xml b/facade/pom.xml deleted file mode 100644 index 9592149..0000000 --- a/facade/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - - com.xiang - xservice-scirpt - 1.0-SNAPSHOT - - - facade - - - 1.8 - 8 - 8 - UTF-8 - - - - - - - - - - - - - com.aliyun - alibaba-dingtalk-service-sdk - 2.0.0 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - exec - - - - - - - \ No newline at end of file diff --git a/facade/src/main/java/com/xiang/dingTalk/common/enums/DingTalkUrlEnum.java b/facade/src/main/java/com/xiang/dingTalk/common/enums/DingTalkUrlEnum.java deleted file mode 100644 index 2c4ea94..0000000 --- a/facade/src/main/java/com/xiang/dingTalk/common/enums/DingTalkUrlEnum.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.xiang.dingTalk.common.enums; - -import lombok.Getter; - -/** - * @Author: xiang - * @Date: 2025-05-09 15:54 - */ -@Getter -public enum DingTalkUrlEnum { - - /** - * 钉钉接口枚举 - */ - DING_TALK_GET_ENTERPRISE_INTER_TOKEN("https://oapi.dingtalk.com/gettoken", "获取企业内部应用Token"), - DING_TALK_ASYNC_SEND_MESSAGE("https://oapi.dingtalk.com/topapi/message/corpconversation/asyncsend_v2", "异步发送工作通知"), - DING_TALK_CHAR_MESSAGE("https://oapi.dingtalk.com/chat/send", "发送消息到企业群旧版SDK"), - ; - - - - final String url; - - final String desc; - - DingTalkUrlEnum(String url, String desc) { - this.url = url; - this.desc = desc; - } -} diff --git a/facade/src/main/java/com/xiang/dingTalk/common/enums/HttpMethod.java b/facade/src/main/java/com/xiang/dingTalk/common/enums/HttpMethod.java deleted file mode 100644 index ae76264..0000000 --- a/facade/src/main/java/com/xiang/dingTalk/common/enums/HttpMethod.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.xiang.dingTalk.common.enums; - -import lombok.Getter; - -/** - * @Author: xiang - * @Date: 2025-05-09 16:00 - */ -@Getter -public enum HttpMethod { - - GET("get"), - ; - final String method; - - HttpMethod(String method) { - this.method = method; - } -} diff --git a/facade/src/main/java/com/xiang/dingTalk/service/DingTalkService.java b/facade/src/main/java/com/xiang/dingTalk/service/DingTalkService.java deleted file mode 100644 index e11f988..0000000 --- a/facade/src/main/java/com/xiang/dingTalk/service/DingTalkService.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.xiang.dingTalk.service; - -import com.alibaba.fastjson2.JSONObject; -import com.dingtalk.api.DefaultDingTalkClient; -import com.dingtalk.api.DingTalkClient; -import com.dingtalk.api.request.OapiChatSendRequest; -import com.dingtalk.api.request.OapiGettokenRequest; -import com.dingtalk.api.request.OapiMessageCorpconversationAsyncsendV2Request; -import com.dingtalk.api.response.OapiChatSendResponse; -import com.dingtalk.api.response.OapiGettokenResponse; -import com.dingtalk.api.response.OapiMessageCorpconversationAsyncsendV2Response; -import com.xiang.dingTalk.common.enums.DingTalkUrlEnum; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * @Author: xiang - * @Date: 2025-05-09 15:06 - */ - -@Slf4j -@Service -public class DingTalkService { - - /** - * 应用凭证id - * https://open-dev.dingtalk.com/fe/ai?hash=%23%2Fapp%2F3fa4c9a7-27f2-4d6f-bbe7-41d2a17b5c11%2Fbaseinfo#/app/3fa4c9a7-27f2-4d6f-bbe7-41d2a17b5c11/baseinfo - */ - private static final String APP_ID = "3fa4c9a7-27f2-4d6f-bbe7-41d2a17b5c11"; - - /** - * 原企业内部应用AgentID - */ - private static final String AGENT_ID = "3829551658"; - - /** - * 组织ID - * - */ - private static final String CORP_ID = "dingf2c4425cd179a26ef2c783f7214b6d69"; - - private static final String CLIENT_ID = "dingcc9fikz1c0e5wb9v"; - - private static final String CLIENT_SECRET = "wyapsH6y8P1K_wuTPKGKwG0mquj1uth9Dxn6HcRpta3sh8Syukl0C8nOmR1PeBzs"; - - private static final String GRANT_TYPE = "client_credentials"; - - private static final String USER_ID = "450841600726084717"; - - private static final String MSG_TYPE = "text"; - - // userID 450841600726084717 - - // chatID chatd16d8daeea33b36b73588c676d508096 - - /** - * 发送消息到企业群 - * @return - */ - public String sendChatMessage(String chatId, String message) throws Exception{ - String token = getToken(); - DefaultDingTalkClient client = new DefaultDingTalkClient(DingTalkUrlEnum.DING_TALK_CHAR_MESSAGE.getUrl()); - OapiChatSendRequest req = new OapiChatSendRequest(); - req.setChatid(chatId); - OapiChatSendRequest.Msg msg = new OapiChatSendRequest.Msg(); - OapiChatSendRequest.Text text = new OapiChatSendRequest.Text(); - text.setContent(message); - msg.setText(text); - msg.setMsgtype("text"); - req.setMsg(msg); - OapiChatSendResponse rsp = client.execute(req, token); - log.info("[DingTalk] send chat message, req:{}, token:{}, response:{}", JSONObject.toJSONString(req), token, JSONObject.toJSONString(rsp)); - return rsp.getMessageId(); - } - - /** - * 异步发送工作同志--文本类型 - * @param userId - * @param message - * @return - * @throws Exception - */ - public String asyncSendMessage(String userId, String message) throws Exception { - String token = getToken(); - DingTalkClient client = new DefaultDingTalkClient(DingTalkUrlEnum.DING_TALK_ASYNC_SEND_MESSAGE.getUrl()); - OapiMessageCorpconversationAsyncsendV2Request req = new OapiMessageCorpconversationAsyncsendV2Request(); - req.setAgentId(Long.parseLong(AGENT_ID)); - req.setUseridList(userId); - req.setToAllUser(false); - OapiMessageCorpconversationAsyncsendV2Request.Msg obj1 = new OapiMessageCorpconversationAsyncsendV2Request.Msg(); - obj1.setMsgtype(MSG_TYPE); - OapiMessageCorpconversationAsyncsendV2Request.Text obj2 = new OapiMessageCorpconversationAsyncsendV2Request.Text(); - obj2.setContent(message); - obj1.setText(obj2); - req.setMsg(obj1); - log.info("send Ding Talk message, userId:{}, message:{}", userId, message); - OapiMessageCorpconversationAsyncsendV2Response rsp = client.execute(req, token); - log.info("send Ding Talk message response, taskId:{}", JSONObject.toJSONString(rsp)); - return rsp.getTaskId().toString(); - } - - - /** - * 获取企业内部应用token - * - * @return - * @throws Exception - */ - public String getToken() throws Exception { - DingTalkClient client = new DefaultDingTalkClient(DingTalkUrlEnum.DING_TALK_GET_ENTERPRISE_INTER_TOKEN.getUrl()); - OapiGettokenRequest req = new OapiGettokenRequest(); - req.setAppkey(CLIENT_ID); - req.setAppsecret(CLIENT_SECRET); - req.setHttpMethod("GET"); - OapiGettokenResponse rsp = client.execute(req); - return rsp.getAccessToken(); - } -} diff --git a/pom.xml b/pom.xml index fa2ce12..37732db 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + com.xiang + xservice-basic + 1.0-SNAPSHOT + + com.xiang xservice-scirpt 1.0-SNAPSHOT pom - facade script @@ -23,6 +28,16 @@ + com.xiang + xservice-common + 1.0-snapshot + + + com.xiang + xservice-third-part + 1.0-snapshot + + diff --git a/script/pom.xml b/script/pom.xml index 2eacea8..9d1de9c 100644 --- a/script/pom.xml +++ b/script/pom.xml @@ -20,14 +20,6 @@ UTF-8 - - - com.xiang - facade - 1.0-SNAPSHOT - - - diff --git a/script/src/main/java/com/xiang/common/Result.java b/script/src/main/java/com/xiang/common/Result.java deleted file mode 100644 index 304b435..0000000 --- a/script/src/main/java/com/xiang/common/Result.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.xiang.common; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Collections; -import java.util.List; - -/** - * @Author: xiang - * @Date: 2025-05-09 14:09 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class Result { - - private String code; - - private String message; - - private List data; - - public static Result success(String message) { - return new Result("200", message, null); - } - - - public static Result success(String message, List data) { - return new Result("200", message, data); - } - public static Result success(String message, T data) { - return new Result("200", message, Collections.singletonList(data)); - } - - public static Result error(String message) { - return new Result("500", message, null); - } - - public static Result error(String message, T data) { - return new Result("500", message, Collections.singletonList(data)); - } - public static Result error(String message, List data) { - return new Result("500", message, data); - } - - public static Result error(String code, String message) { - return new Result(code, message, null); - } -} diff --git a/script/src/main/java/com/xiang/common/factory/xb/QueryThreadFactory.java b/script/src/main/java/com/xiang/common/factory/xb/QueryThreadFactory.java deleted file mode 100644 index 9d734a9..0000000 --- a/script/src/main/java/com/xiang/common/factory/xb/QueryThreadFactory.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.xiang.common.factory.xb; - -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.atomic.AtomicInteger; - -/** - * @Author: xiang - * @Date: 2025-05-15 08:54 - */ -public class QueryThreadFactory implements ThreadFactory { - - private final String threadName; - private final boolean daemon; - - private final AtomicInteger threadNum = new AtomicInteger(); - - public QueryThreadFactory(String threadName, boolean daemon) { - this.threadName = threadName; - this.daemon = daemon; - } - - @Override - public Thread newThread(Runnable r) { - Thread thread = new Thread(r, this.threadName + "[#" + threadNum.incrementAndGet() + "]"); - thread.setDaemon(this.daemon); - return thread; - } -} diff --git a/script/src/main/java/com/xiang/controller/JntyzxController.java b/script/src/main/java/com/xiang/controller/JntyzxController.java deleted file mode 100644 index 57ce34e..0000000 --- a/script/src/main/java/com/xiang/controller/JntyzxController.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.xiang.controller; - -import com.xiang.common.Result; -import com.xiang.service.JntyzxService; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @Author: xiang - * @Date: 2025-05-14 15:13 - */ -@RestController -@RequestMapping("/system/jntyzx") -@RequiredArgsConstructor -public class JntyzxController { - - private final JntyzxService jntyzxService; - - @PostMapping("/queryVenue") - public Result queryVenue() throws Exception { - jntyzxService.queryAvailable(); - return Result.success("success"); - } - -} diff --git a/script/src/main/java/com/xiang/utils/HttpUtils.java b/script/src/main/java/com/xiang/utils/HttpUtils.java deleted file mode 100644 index 51f9881..0000000 --- a/script/src/main/java/com/xiang/utils/HttpUtils.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.xiang.utils; - -import com.alibaba.fastjson2.JSONObject; -import com.xiang.common.URLConstants; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.MapUtils; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; -import org.springframework.stereotype.Component; - -import java.io.Closeable; -import java.io.IOException; -import java.util.Map; -import java.util.Set; - -/** - * @Author: xiang - * @Date: 2025-05-08 14:39 - */ -@Slf4j -@Component -public class HttpUtils { - - private int socketTimeOut = 60 * 1000; - private int connectTimeout = 60 * 1000; - private int connectionRequestTimeout = 15 * 1000; - private int defaultMaxPerRoute = 500; - private int maxTotal = 2000; - - public String doPost(String url, Map header, String jsonParams) { - RequestConfig requestConfig = RequestConfig.custom() - // 设置连接超时时间 - .setConnectTimeout(connectTimeout) - // 设置Socket超时时间 - .setSocketTimeout(socketTimeOut) - .setConnectionRequestTimeout(connectionRequestTimeout) - .build(); - //创建httpClient对象 - CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig).build(); - CloseableHttpResponse response = null; - String result = ""; - try { - // 创建http请求 - HttpPost httpPost = new HttpPost(url); - httpPost.addHeader("Content-Type", "application/json"); - // 创建请求内容 - StringEntity entity = new StringEntity(jsonParams, "utf-8"); - entity.setContentType("application/json"); - httpPost.setEntity(entity); - // 设置请求头 - if (null != header && !header.isEmpty()) { - Set> entries = header.entrySet(); - for (Map.Entry e : entries) { - httpPost.setHeader(e.getKey(), e.getValue()); - } - } - response = httpClient.execute(httpPost); - result = EntityUtils.toString(response.getEntity(), "utf-8"); - } catch (Exception e) { - log.error("doPost异常", e); - } finally { - //关闭资源 - closeResource(response, httpClient); - } - return result; - } - - public String doGet(String url, Map header, Map param) { - RequestConfig requestConfig = RequestConfig.custom() - // 设置连接超时时间 - .setConnectTimeout(connectTimeout) - // 设置Socket超时时间 - .setSocketTimeout(socketTimeOut) - .setConnectionRequestTimeout(connectionRequestTimeout) - .build(); - CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(requestConfig).build(); - CloseableHttpResponse response; - String result = ""; - try { - String request = ""; - if (MapUtils.isNotEmpty(param)) { - StringBuilder req = new StringBuilder("?"); - for (Map.Entry entry : param.entrySet()) { - req.append(entry.getKey()).append("=").append(entry.getValue()).append("&"); - } - request = req.substring(0, req.length() - 1); - } - - HttpGet httpGet = new HttpGet(url + request); - httpGet.addHeader("Content-Type", "application/json"); - if (MapUtils.isNotEmpty(header)) { - for (Map.Entry entry : header.entrySet()) { - httpGet.setHeader(entry.getKey(), entry.getValue()); - } - } - log.info("doGet请求：请求地址：{}", url + request); - response = httpClient.execute(httpGet); - result = EntityUtils.toString(response.getEntity(), "utf-8"); - } catch (Exception e) { - log.error("doGet异常：", e); - } - return result; - } - - /** - * @Description 关闭资源 - */ - private void closeResource(Closeable... resources) { - try { - for (Closeable resource : resources) { - if (resource != null) { - resource.close(); - } - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - public static void main(String[] args) { -// HttpUtils httpUtils = new HttpUtils(); -// Map map = new HashMap<>(); -// map.put("Cookie", "SL_G_WPT_TO=en; SL_GWPT_Show_Hide_tmp=1; SL_wptGlobTipTmp=1; koa:sess=eyJ1c2VySWQiOjU1OTg1MywiX2V4cGlyZSI6MTc3MjYwNDkyNjI4OCwiX21heEFnZSI6MjU5MjAwMDAwMDB9; koa:sess.sig=OdaqjpLkIp19lXn0lFuOsHX7vEM"); -// String response = httpUtils.doPost("https://www.glados.one/api/user/checkin", map, "{\"token\":\"glados.one\"}"); -// System.out.println(response); - HttpUtils httpUtils = new HttpUtils(); -// Map header = Maps.newHashMap(); -// header.put("X-Access-Token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3NDcyMTAwNzQsInVzZXJuYW1lIjoid3hfb3Blbl9pZF9vMjFNWDR5N3doWENHanZVVEdQNkNUejJIYkQ4In0.0h_cAH_e5cCXDQlQN40jZDBgtfrzQWAmgl3YPQf0d-M"); -// System.out.println(httpUtils.doGet("https://jntyzx.cn:8443/GYM-JN/multi/Subscribe/getSubscribeByToday?gid=03&isWeekend=1", header, null)); - - JSONObject jsonObject = new JSONObject(); - jsonObject.put("code", "012414"); - jsonObject.put("unionId", "o896o5y8bJZYMh2gdKhDdmUKc0Wk"); - String resp = httpUtils.doPost(URLConstants.XB_QUERY_FUND_INFO, null, JSONObject.toJSONString(jsonObject)); - System.out.println(resp); - } -} diff --git a/script/src/main/java/com/xiang/xservice/CheckHealthController.java b/script/src/main/java/com/xiang/xservice/CheckHealthController.java new file mode 100644 index 0000000..8310e46 --- /dev/null +++ b/script/src/main/java/com/xiang/xservice/CheckHealthController.java @@ -0,0 +1,4 @@ +package com.xiang.xservice; + +public class CheckHealthController { +} diff --git a/script/src/main/java/com/xiang/controller/IndexController.java b/script/src/main/java/com/xiang/xservice/IndexController.java similarity index 90% rename from script/src/main/java/com/xiang/controller/IndexController.java rename to script/src/main/java/com/xiang/xservice/IndexController.java index 84c6c9c..482378a 100644 --- a/script/src/main/java/com/xiang/controller/IndexController.java +++ b/script/src/main/java/com/xiang/xservice/IndexController.java @@ -1,6 +1,6 @@ -package com.xiang.controller; +package com.xiang.xservice; -import com.xiang.common.Result; +import com.xiang.xservice.basic.common.resp.Result; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/script/src/main/java/com/xiang/xservice/domain/config/AliyunDnsPropertyConfig.java b/script/src/main/java/com/xiang/xservice/domain/config/AliyunDnsPropertyConfig.java new file mode 100644 index 0000000..cb5c085 --- /dev/null +++ b/script/src/main/java/com/xiang/xservice/domain/config/AliyunDnsPropertyConfig.java @@ -0,0 +1,15 @@ +package com.xiang.xservice.domain.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +@ConfigurationProperties(prefix = "aliyun.dns") +@Data +public class AliyunDnsPropertyConfig { + + private List RR; +} diff --git a/domain/src/main/java/com/xiang/controller/DynamicDomainController.java b/script/src/main/java/com/xiang/xservice/domain/controller/DynamicDomainController.java old mode 100755 new mode 100644 similarity index 82% rename from domain/src/main/java/com/xiang/controller/DynamicDomainController.java rename to script/src/main/java/com/xiang/xservice/domain/controller/DynamicDomainController.java index 323e939..5a93844 --- a/domain/src/main/java/com/xiang/controller/DynamicDomainController.java +++ b/script/src/main/java/com/xiang/xservice/domain/controller/DynamicDomainController.java @@ -1,8 +1,9 @@ -package com.xiang.controller; +package com.xiang.xservice.domain.controller; -import com.xiang.common.Result; -import com.xiang.service.DomainService; -import com.xiang.utils.IpUtils; + +import com.xiang.xservice.basic.common.resp.Result; +import com.xiang.xservice.basic.utils.IpUtils; +import com.xiang.xservice.domain.service.IDomainService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; @@ -25,7 +26,7 @@ import java.time.LocalDateTime; @RequiredArgsConstructor public class DynamicDomainController { - private final DomainService domainService; + private final IDomainService IDomainService; @GetMapping("/getIp") public Result getPublicIp() { @@ -44,7 +45,7 @@ public class DynamicDomainController { try { String publicIp = IpUtils.getPublicIp(); log.info("获取公网IP成功，time:{}, ip:{}", LocalDateTime.now(), publicIp); - domainService.dynamicDomainAnalysis(publicIp); + IDomainService.dynamicDomainAnalysis(publicIp); return Result.success("获取公网IP成功"); } catch (Exception e) { log.error("获取公网IP失败， time:{}", LocalDateTime.now(), e); diff --git a/domain/src/main/java/com/xiang/entity/resp/PublicIpResp.java b/script/src/main/java/com/xiang/xservice/domain/entity/resp/PublicIpResp.java old mode 100755 new mode 100644 similarity index 87% rename from domain/src/main/java/com/xiang/entity/resp/PublicIpResp.java rename to script/src/main/java/com/xiang/xservice/domain/entity/resp/PublicIpResp.java index 0f36fa2..6a0e387 --- a/domain/src/main/java/com/xiang/entity/resp/PublicIpResp.java +++ b/script/src/main/java/com/xiang/xservice/domain/entity/resp/PublicIpResp.java @@ -1,4 +1,4 @@ -package com.xiang.entity.resp; +package com.xiang.xservice.domain.entity.resp; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/domain/src/main/java/com/xiang/schedule/DynamicDomainSchedule.java b/script/src/main/java/com/xiang/xservice/domain/schedule/DynamicDomainSchedule.java old mode 100755 new mode 100644 similarity index 76% rename from domain/src/main/java/com/xiang/schedule/DynamicDomainSchedule.java rename to script/src/main/java/com/xiang/xservice/domain/schedule/DynamicDomainSchedule.java index c706f62..8a73b2b --- a/domain/src/main/java/com/xiang/schedule/DynamicDomainSchedule.java +++ b/script/src/main/java/com/xiang/xservice/domain/schedule/DynamicDomainSchedule.java @@ -1,7 +1,7 @@ -package com.xiang.schedule; +package com.xiang.xservice.domain.schedule; -import com.xiang.service.DomainServiceImpl; -import com.xiang.utils.IpUtils; +import com.xiang.xservice.basic.utils.IpUtils; +import com.xiang.xservice.domain.service.IDomainService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -17,7 +17,7 @@ import org.springframework.stereotype.Component; @Slf4j public class DynamicDomainSchedule { - private final DomainServiceImpl domainService; + private final IDomainService IDomainService; @Scheduled(cron = "0 0/5 * * * ? ") public void dynamicDomainSchedule() { @@ -29,7 +29,7 @@ public class DynamicDomainSchedule { } if (StringUtils.isNotBlank(publicIp)) { try { - domainService.dynamicDomainAnalysis(publicIp); + IDomainService.dynamicDomainAnalysis(publicIp); } catch (Exception e) { log.error("动态解析公网ip失败, ip:{}", publicIp, e); } diff --git a/domain/src/main/java/com/xiang/service/DomainService.java b/script/src/main/java/com/xiang/xservice/domain/service/IDomainService.java old mode 100755 new mode 100644 similarity index 72% rename from domain/src/main/java/com/xiang/service/DomainService.java rename to script/src/main/java/com/xiang/xservice/domain/service/IDomainService.java index ec3eb90..bb66aaf --- a/domain/src/main/java/com/xiang/service/DomainService.java +++ b/script/src/main/java/com/xiang/xservice/domain/service/IDomainService.java @@ -1,10 +1,10 @@ -package com.xiang.service; +package com.xiang.xservice.domain.service; /** * @Author: xiang * @Date: 2025-06-10 16:48 */ -public interface DomainService { +public interface IDomainService { /** * 动态域名解析 diff --git a/domain/src/main/java/com/xiang/service/DomainServiceImpl.java b/script/src/main/java/com/xiang/xservice/domain/service/IDomainServiceImpl.java old mode 100755 new mode 100644 similarity index 59% rename from domain/src/main/java/com/xiang/service/DomainServiceImpl.java rename to script/src/main/java/com/xiang/xservice/domain/service/IDomainServiceImpl.java index ddaa4c5..92e2cdd --- a/domain/src/main/java/com/xiang/service/DomainServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/domain/service/IDomainServiceImpl.java @@ -1,4 +1,4 @@ -package com.xiang.service; +package com.xiang.xservice.domain.service; import com.aliyun.alidns20150109.Client; @@ -8,7 +8,8 @@ import com.aliyun.alidns20150109.models.DescribeSubDomainRecordsResponse; import com.aliyun.alidns20150109.models.DescribeSubDomainRecordsResponseBody; import com.aliyun.alidns20150109.models.UpdateDomainRecordRequest; import com.aliyun.teaopenapi.models.Config; -import com.xiang.dingTalk.service.DingTalkService; +import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; +import com.xiang.xservice.domain.config.AliyunDnsPropertyConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -23,7 +24,7 @@ import java.util.List; @Service @Slf4j @RequiredArgsConstructor -public class DomainServiceImpl implements DomainService { +public class IDomainServiceImpl implements IDomainService { private static final String ACCESS_KEY_ID = "LTAI5tDMjaVF8Bbqcpp4dmvP"; private static final String ACCESS_KEY_SECRET = "nkmnaNjWQy5984C5kjyS0oDmdMKGQd"; @@ -34,8 +35,7 @@ public class DomainServiceImpl implements DomainService { /** * 主机记录，例如 home.example.com */ - @Value("${aliyun.dns.RR}") - private String rr; + private final AliyunDnsPropertyConfig aliyunDnsPropertyConfig; private static final String TYPE = "A"; private final DingTalkService dingTalkService; @@ -46,27 +46,29 @@ public class DomainServiceImpl implements DomainService { public void dynamicDomainAnalysis(String publicIp) throws Exception { Client client = createClient(); - // 查询记录 - DescribeSubDomainRecordsRequest query = new DescribeSubDomainRecordsRequest() - .setSubDomain(rr + "." + DOMAIN_NAME) - .setType(TYPE); - DescribeSubDomainRecordsResponse response = client.describeSubDomainRecords(query); - List records = - response.getBody().getDomainRecords().getRecord(); + for (String rr : aliyunDnsPropertyConfig.getRR()) { + // 查询记录 + DescribeSubDomainRecordsRequest query = new DescribeSubDomainRecordsRequest() + .setSubDomain(rr + "." + DOMAIN_NAME) + .setType(TYPE); + DescribeSubDomainRecordsResponse response = client.describeSubDomainRecords(query); + List records = + response.getBody().getDomainRecords().getRecord(); - if (records.isEmpty()) { - log.info("未找到记录，添加记录..., ip:{}", publicIp); - addDnsRecord(client, publicIp); - dingTalkService.sendChatMessage(chatId, "动态解析公网ip成功，域名：" + rr + "." + DOMAIN_NAME + ", 新ip:" + publicIp); - } else { - String recordId = records.get(0).getRecordId(); - String currentValue = records.get(0).getValue(); - if (!publicIp.equals(currentValue)) { - log.info("IP变更，更新记录...,ip:{}", publicIp); - updateDnsRecord(client, recordId, publicIp); + if (records.isEmpty()) { + log.info("未找到记录，添加记录..., ip:{}", publicIp); + addDnsRecord(client, publicIp, rr); dingTalkService.sendChatMessage(chatId, "动态解析公网ip成功，域名：" + rr + "." + DOMAIN_NAME + ", 新ip:" + publicIp); } else { - log.info("ip未变更，无需修改，ip:{}", publicIp); + String recordId = records.get(0).getRecordId(); + String currentValue = records.get(0).getValue(); + if (!publicIp.equals(currentValue)) { + log.info("IP变更，更新记录...,ip:{}", publicIp); + updateDnsRecord(client, recordId, publicIp, rr); + dingTalkService.sendChatMessage(chatId, "动态解析公网ip成功，域名：" + rr + "." + DOMAIN_NAME + ", 新ip:" + publicIp); + } else { + log.info("ip未变更，无需修改，ip:{}", publicIp); + } } } } @@ -79,7 +81,7 @@ public class DomainServiceImpl implements DomainService { return new Client(config); } - private void updateDnsRecord(Client client, String recordId, String newIp) throws Exception { + private void updateDnsRecord(Client client, String recordId, String newIp, String rr) throws Exception { UpdateDomainRecordRequest request = new UpdateDomainRecordRequest() .setRecordId(recordId) .setRR(rr) @@ -89,7 +91,7 @@ public class DomainServiceImpl implements DomainService { log.info("更新成功: ，newIP:{}", newIp); } - private void addDnsRecord(Client client, String ip) throws Exception { + private void addDnsRecord(Client client, String ip, String rr) throws Exception { AddDomainRecordRequest request = new AddDomainRecordRequest() .setDomainName(DOMAIN_NAME) .setRR(rr) diff --git a/script/src/main/java/com/xiang/common/GladosConstants.java b/script/src/main/java/com/xiang/xservice/glados/common/GladosConstants.java similarity index 90% rename from script/src/main/java/com/xiang/common/GladosConstants.java rename to script/src/main/java/com/xiang/xservice/glados/common/GladosConstants.java index 4cb66bf..baa0570 100644 --- a/script/src/main/java/com/xiang/common/GladosConstants.java +++ b/script/src/main/java/com/xiang/xservice/glados/common/GladosConstants.java @@ -1,4 +1,4 @@ -package com.xiang.common; +package com.xiang.xservice.glados.common; /** * @Author: xiang diff --git a/script/src/main/java/com/xiang/xservice/glados/common/URLConstants.java b/script/src/main/java/com/xiang/xservice/glados/common/URLConstants.java new file mode 100644 index 0000000..41adbca --- /dev/null +++ b/script/src/main/java/com/xiang/xservice/glados/common/URLConstants.java @@ -0,0 +1,14 @@ +package com.xiang.xservice.glados.common; + +public class URLConstants { + + /** + * glados 主域名 + */ + public static final String GLADOS_URL_PREFIX = "https://www.glados.one"; + + /** + * 签到 + */ + public static final String GLADOS_CHECK_IN_URL = GLADOS_URL_PREFIX + "/api/user/checkin"; +} diff --git a/script/src/main/java/com/xiang/controller/GLaDOSController.java b/script/src/main/java/com/xiang/xservice/glados/controller/GLaDOSController.java similarity index 75% rename from script/src/main/java/com/xiang/controller/GLaDOSController.java rename to script/src/main/java/com/xiang/xservice/glados/controller/GLaDOSController.java index 9676c07..7a248bb 100644 --- a/script/src/main/java/com/xiang/controller/GLaDOSController.java +++ b/script/src/main/java/com/xiang/xservice/glados/controller/GLaDOSController.java @@ -1,8 +1,8 @@ -package com.xiang.controller; +package com.xiang.xservice.glados.controller; -import com.xiang.common.Result; -import com.xiang.entity.request.GladosCheckInReq; -import com.xiang.service.GLaDOSService; +import com.xiang.xservice.basic.common.resp.Result; +import com.xiang.xservice.glados.entity.req.GladosCheckInReq; +import com.xiang.xservice.glados.service.GLaDOSService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/script/src/main/java/com/xiang/entity/pojo/GladosRunLog.java b/script/src/main/java/com/xiang/xservice/glados/entity/GladosRunLog.java similarity index 93% rename from script/src/main/java/com/xiang/entity/pojo/GladosRunLog.java rename to script/src/main/java/com/xiang/xservice/glados/entity/GladosRunLog.java index d69fd77..da0ed22 100644 --- a/script/src/main/java/com/xiang/entity/pojo/GladosRunLog.java +++ b/script/src/main/java/com/xiang/xservice/glados/entity/GladosRunLog.java @@ -1,4 +1,4 @@ -package com.xiang.entity.pojo; +package com.xiang.xservice.glados.entity; import lombok.Builder; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/request/GladosCheckInReq.java b/script/src/main/java/com/xiang/xservice/glados/entity/req/GladosCheckInReq.java similarity index 78% rename from script/src/main/java/com/xiang/entity/request/GladosCheckInReq.java rename to script/src/main/java/com/xiang/xservice/glados/entity/req/GladosCheckInReq.java index a156eda..d3b8f96 100644 --- a/script/src/main/java/com/xiang/entity/request/GladosCheckInReq.java +++ b/script/src/main/java/com/xiang/xservice/glados/entity/req/GladosCheckInReq.java @@ -1,4 +1,4 @@ -package com.xiang.entity.request; +package com.xiang.xservice.glados.entity.req; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/response/GLaDOSResponse.java b/script/src/main/java/com/xiang/xservice/glados/entity/resp/GLaDOSResponse.java similarity index 84% rename from script/src/main/java/com/xiang/entity/response/GLaDOSResponse.java rename to script/src/main/java/com/xiang/xservice/glados/entity/resp/GLaDOSResponse.java index 1b31644..e13ba53 100644 --- a/script/src/main/java/com/xiang/entity/response/GLaDOSResponse.java +++ b/script/src/main/java/com/xiang/xservice/glados/entity/resp/GLaDOSResponse.java @@ -1,4 +1,4 @@ -package com.xiang.entity.response; +package com.xiang.xservice.glados.entity.resp; import lombok.Data; diff --git a/script/src/main/java/com/xiang/repository/GladosMapper.java b/script/src/main/java/com/xiang/xservice/glados/repository/GladosMapper.java similarity index 75% rename from script/src/main/java/com/xiang/repository/GladosMapper.java rename to script/src/main/java/com/xiang/xservice/glados/repository/GladosMapper.java index 3aabb5e..dd06ecb 100644 --- a/script/src/main/java/com/xiang/repository/GladosMapper.java +++ b/script/src/main/java/com/xiang/xservice/glados/repository/GladosMapper.java @@ -1,7 +1,7 @@ -package com.xiang.repository; +package com.xiang.xservice.glados.repository; -import com.xiang.entity.pojo.GladosRunLog; -import com.xiang.entity.pojo.User; +import com.xiang.xservice.glados.entity.GladosRunLog; +import com.xiang.xservice.xb.entity.pojo.User; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/script/src/main/java/com/xiang/schedule/GladosCheckInJob.java b/script/src/main/java/com/xiang/xservice/glados/schedule/GladosCheckInJob.java similarity index 86% rename from script/src/main/java/com/xiang/schedule/GladosCheckInJob.java rename to script/src/main/java/com/xiang/xservice/glados/schedule/GladosCheckInJob.java index b7d5bd4..02d76bf 100644 --- a/script/src/main/java/com/xiang/schedule/GladosCheckInJob.java +++ b/script/src/main/java/com/xiang/xservice/glados/schedule/GladosCheckInJob.java @@ -1,6 +1,6 @@ -package com.xiang.schedule; +package com.xiang.xservice.glados.schedule; -import com.xiang.service.GLaDOSService; +import com.xiang.xservice.glados.service.GLaDOSService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; diff --git a/script/src/main/java/com/xiang/service/GLaDOSService.java b/script/src/main/java/com/xiang/xservice/glados/service/GLaDOSService.java similarity index 76% rename from script/src/main/java/com/xiang/service/GLaDOSService.java rename to script/src/main/java/com/xiang/xservice/glados/service/GLaDOSService.java index 510e5a4..5198720 100644 --- a/script/src/main/java/com/xiang/service/GLaDOSService.java +++ b/script/src/main/java/com/xiang/xservice/glados/service/GLaDOSService.java @@ -1,4 +1,4 @@ -package com.xiang.service; +package com.xiang.xservice.glados.service; /** * @Author: xiang diff --git a/script/src/main/java/com/xiang/service/GLaDOSServiceImpl.java b/script/src/main/java/com/xiang/xservice/glados/service/GLaDOSServiceImpl.java similarity index 89% rename from script/src/main/java/com/xiang/service/GLaDOSServiceImpl.java rename to script/src/main/java/com/xiang/xservice/glados/service/GLaDOSServiceImpl.java index 31cd42a..18fbb0f 100644 --- a/script/src/main/java/com/xiang/service/GLaDOSServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/glados/service/GLaDOSServiceImpl.java @@ -1,15 +1,15 @@ -package com.xiang.service; +package com.xiang.xservice.glados.service; import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Maps; -import com.xiang.common.GladosConstants; -import com.xiang.common.URLConstants; -import com.xiang.dingTalk.service.DingTalkService; -import com.xiang.entity.pojo.GladosRunLog; -import com.xiang.entity.pojo.User; -import com.xiang.entity.response.GLaDOSResponse; -import com.xiang.repository.GladosMapper; -import com.xiang.utils.HttpUtils; +import com.xiang.xservice.basic.utils.HttpUtils; +import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; +import com.xiang.xservice.glados.common.GladosConstants; +import com.xiang.xservice.glados.common.URLConstants; +import com.xiang.xservice.glados.entity.GladosRunLog; +import com.xiang.xservice.xb.entity.pojo.User; +import com.xiang.xservice.glados.entity.resp.GLaDOSResponse; +import com.xiang.xservice.glados.repository.GladosMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -31,8 +31,6 @@ import java.util.Objects; @RequiredArgsConstructor public class GLaDOSServiceImpl implements GLaDOSService{ - private final HttpUtils httpUtils; - private final GladosMapper gladosMapper; private final DingTalkService dingTalkService; @@ -72,7 +70,7 @@ public class GLaDOSServiceImpl implements GLaDOSService{ String response = null; try { - response = httpUtils.doPost(URLConstants.GLADOS_CHECK_IN_URL, header, GladosConstants.GLADOS_CHECK_IN_BODY); + response = HttpUtils.doPost(URLConstants.GLADOS_CHECK_IN_URL, header, GladosConstants.GLADOS_CHECK_IN_BODY); } catch (Exception e) { log.error("http do post error, header:{}, jsonParams:{}", JSONObject.toJSONString(header), GladosConstants.GLADOS_CHECK_IN_BODY, e); } diff --git a/script/src/main/java/com/xiang/entity/response/jntyzx/JntyzxResponse.java b/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/JntyzxResponse.java similarity index 84% rename from script/src/main/java/com/xiang/entity/response/jntyzx/JntyzxResponse.java rename to script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/JntyzxResponse.java index e1aa31f..7c973ba 100644 --- a/script/src/main/java/com/xiang/entity/response/jntyzx/JntyzxResponse.java +++ b/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/JntyzxResponse.java @@ -1,4 +1,4 @@ -package com.xiang.entity.response.jntyzx; +package com.xiang.xservice.jntyzx.entity.resp; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/response/jntyzx/venue/query/QueryVenueResponse.java b/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/QueryVenueResponse.java similarity index 79% rename from script/src/main/java/com/xiang/entity/response/jntyzx/venue/query/QueryVenueResponse.java rename to script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/QueryVenueResponse.java index ebb6d53..8bf8320 100644 --- a/script/src/main/java/com/xiang/entity/response/jntyzx/venue/query/QueryVenueResponse.java +++ b/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/QueryVenueResponse.java @@ -1,4 +1,4 @@ -package com.xiang.entity.response.jntyzx.venue.query; +package com.xiang.xservice.jntyzx.entity.resp.query; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/response/jntyzx/venue/query/SitePositionList.java b/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/SitePositionList.java similarity index 93% rename from script/src/main/java/com/xiang/entity/response/jntyzx/venue/query/SitePositionList.java rename to script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/SitePositionList.java index f78f528..dc0c20a 100644 --- a/script/src/main/java/com/xiang/entity/response/jntyzx/venue/query/SitePositionList.java +++ b/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/SitePositionList.java @@ -1,4 +1,4 @@ -package com.xiang.entity.response.jntyzx.venue.query; +package com.xiang.xservice.jntyzx.entity.resp.query; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/response/jntyzx/venue/query/TimeList.java b/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/TimeList.java similarity index 89% rename from script/src/main/java/com/xiang/entity/response/jntyzx/venue/query/TimeList.java rename to script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/TimeList.java index 9b279dd..6ff50ef 100644 --- a/script/src/main/java/com/xiang/entity/response/jntyzx/venue/query/TimeList.java +++ b/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/TimeList.java @@ -1,4 +1,4 @@ -package com.xiang.entity.response.jntyzx.venue.query; +package com.xiang.xservice.jntyzx.entity.resp.query; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/response/jntyzx/venue/query/VenueList.java b/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/VenueList.java similarity index 81% rename from script/src/main/java/com/xiang/entity/response/jntyzx/venue/query/VenueList.java rename to script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/VenueList.java index b5f83e8..1bb6953 100644 --- a/script/src/main/java/com/xiang/entity/response/jntyzx/venue/query/VenueList.java +++ b/script/src/main/java/com/xiang/xservice/jntyzx/entity/resp/query/VenueList.java @@ -1,4 +1,4 @@ -package com.xiang.entity.response.jntyzx.venue.query; +package com.xiang.xservice.jntyzx.entity.resp.query; import lombok.Data; diff --git a/script/src/main/java/com/xiang/service/JntyzxService.java b/script/src/main/java/com/xiang/xservice/jntyzx/service/JntyzxService.java similarity index 80% rename from script/src/main/java/com/xiang/service/JntyzxService.java rename to script/src/main/java/com/xiang/xservice/jntyzx/service/JntyzxService.java index ce9c404..5e48e17 100644 --- a/script/src/main/java/com/xiang/service/JntyzxService.java +++ b/script/src/main/java/com/xiang/xservice/jntyzx/service/JntyzxService.java @@ -1,4 +1,4 @@ -package com.xiang.service; +package com.xiang.xservice.jntyzx.service; /** * @Author: xiang diff --git a/script/src/main/java/com/xiang/service/JntyzxServiceImpl.java b/script/src/main/java/com/xiang/xservice/jntyzx/service/JntyzxServiceImpl.java similarity index 87% rename from script/src/main/java/com/xiang/service/JntyzxServiceImpl.java rename to script/src/main/java/com/xiang/xservice/jntyzx/service/JntyzxServiceImpl.java index 5817cc9..ce5e291 100644 --- a/script/src/main/java/com/xiang/service/JntyzxServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/jntyzx/service/JntyzxServiceImpl.java @@ -1,14 +1,14 @@ -package com.xiang.service; +package com.xiang.xservice.jntyzx.service; import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Maps; -import com.xiang.common.URLConstants; -import com.xiang.dingTalk.service.DingTalkService; -import com.xiang.entity.response.jntyzx.JntyzxResponse; -import com.xiang.entity.response.jntyzx.venue.query.QueryVenueResponse; -import com.xiang.entity.response.jntyzx.venue.query.SitePositionList; -import com.xiang.entity.response.jntyzx.venue.query.VenueList; -import com.xiang.utils.HttpUtils; +import com.xiang.xservice.basic.utils.HttpUtils; +import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; +import com.xiang.xservice.xb.common.URLConstants; +import com.xiang.xservice.jntyzx.entity.resp.JntyzxResponse; +import com.xiang.xservice.jntyzx.entity.resp.query.QueryVenueResponse; +import com.xiang.xservice.jntyzx.entity.resp.query.SitePositionList; +import com.xiang.xservice.jntyzx.entity.resp.query.VenueList; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -30,7 +30,6 @@ import java.util.stream.Collectors; @Slf4j public class JntyzxServiceImpl implements JntyzxService{ - private final HttpUtils httpUtils; private final DingTalkService dingTalkService; @@ -44,7 +43,7 @@ public class JntyzxServiceImpl implements JntyzxService{ header.put("X-Access-Token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3NDcyMTAwNzQsInVzZXJuYW1lIjoid3hfb3Blbl9pZF9vMjFNWDR5N3doWENHanZVVEdQNkNUejJIYkQ4In0.0h_cAH_e5cCXDQlQN40jZDBgtfrzQWAmgl3YPQf0d-M"); String resp = null; try { - resp = httpUtils.doGet(url, header, null); + resp = HttpUtils.doGet(url, header, null); } catch (Exception e) { log.error("[doGet] 江南体育中心查询当天场地 请求失败, url:{}", url); } diff --git a/script/src/main/java/com/xiang/common/URLConstants.java b/script/src/main/java/com/xiang/xservice/xb/common/URLConstants.java similarity index 80% rename from script/src/main/java/com/xiang/common/URLConstants.java rename to script/src/main/java/com/xiang/xservice/xb/common/URLConstants.java index cf661ca..fdff752 100644 --- a/script/src/main/java/com/xiang/common/URLConstants.java +++ b/script/src/main/java/com/xiang/xservice/xb/common/URLConstants.java @@ -1,4 +1,4 @@ -package com.xiang.common; +package com.xiang.xservice.xb.common; /** * @Author: xiang @@ -6,13 +6,6 @@ package com.xiang.common; */ public class URLConstants { - public static final String GLADOS_URL_PREFIX = "https://www.glados.one"; - - /** - * 签到 - */ - public static final String GLADOS_CHECK_IN_URL = GLADOS_URL_PREFIX + "/api/user/checkin"; - /** * ==================== diff --git a/script/src/main/java/com/xiang/controller/XBController.java b/script/src/main/java/com/xiang/xservice/xb/controller/XBController.java similarity index 76% rename from script/src/main/java/com/xiang/controller/XBController.java rename to script/src/main/java/com/xiang/xservice/xb/controller/XBController.java index 7f9b61e..d8e7f30 100644 --- a/script/src/main/java/com/xiang/controller/XBController.java +++ b/script/src/main/java/com/xiang/xservice/xb/controller/XBController.java @@ -1,14 +1,14 @@ -package com.xiang.controller; +package com.xiang.xservice.xb.controller; import com.google.common.collect.Lists; -import com.xiang.common.Result; -import com.xiang.entity.pojo.xb.XbFundList; -import com.xiang.entity.request.xb.fund.QueryFundInfoReq; -import com.xiang.entity.request.xb.fund.QueryFundListReq; -import com.xiang.entity.request.xb.fund.QueryXbFundListReq; -import com.xiang.entity.response.xbyj.fund.FundInfo; -import com.xiang.entity.response.xbyj.fund.FundList; -import com.xiang.service.FundService; +import com.xiang.xservice.basic.common.resp.Result; +import com.xiang.xservice.xb.entity.pojo.xb.XbFundList; +import com.xiang.xservice.xb.entity.request.xb.fund.QueryFundInfoReq; +import com.xiang.xservice.xb.entity.request.xb.fund.QueryFundListReq; +import com.xiang.xservice.xb.entity.request.xb.fund.QueryXbFundListReq; +import com.xiang.xservice.xb.entity.response.xbyj.fund.FundInfo; +import com.xiang.xservice.xb.entity.response.xbyj.fund.FundList; +import com.xiang.xservice.xb.service.FundService; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.web.bind.annotation.PostMapping; diff --git a/script/src/main/java/com/xiang/entity/pojo/User.java b/script/src/main/java/com/xiang/xservice/xb/entity/pojo/User.java similarity index 84% rename from script/src/main/java/com/xiang/entity/pojo/User.java rename to script/src/main/java/com/xiang/xservice/xb/entity/pojo/User.java index 7508a82..d6b442d 100644 --- a/script/src/main/java/com/xiang/entity/pojo/User.java +++ b/script/src/main/java/com/xiang/xservice/xb/entity/pojo/User.java @@ -1,4 +1,4 @@ -package com.xiang.entity.pojo; +package com.xiang.xservice.xb.entity.pojo; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/pojo/xb/FundInfo.java b/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/FundInfo.java similarity index 87% rename from script/src/main/java/com/xiang/entity/pojo/xb/FundInfo.java rename to script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/FundInfo.java index 4f97a5b..2a27c98 100644 --- a/script/src/main/java/com/xiang/entity/pojo/xb/FundInfo.java +++ b/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/FundInfo.java @@ -1,4 +1,4 @@ -package com.xiang.entity.pojo.xb; +package com.xiang.xservice.xb.entity.pojo.xb; import lombok.Builder; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/pojo/xb/FundMessage.java b/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/FundMessage.java similarity index 91% rename from script/src/main/java/com/xiang/entity/pojo/xb/FundMessage.java rename to script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/FundMessage.java index 3089191..ac69d31 100644 --- a/script/src/main/java/com/xiang/entity/pojo/xb/FundMessage.java +++ b/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/FundMessage.java @@ -1,4 +1,4 @@ -package com.xiang.entity.pojo.xb; +package com.xiang.xservice.xb.entity.pojo.xb; import lombok.Builder; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/pojo/xb/XbFundCount.java b/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/XbFundCount.java similarity index 92% rename from script/src/main/java/com/xiang/entity/pojo/xb/XbFundCount.java rename to script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/XbFundCount.java index c49d345..82dced3 100644 --- a/script/src/main/java/com/xiang/entity/pojo/xb/XbFundCount.java +++ b/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/XbFundCount.java @@ -1,4 +1,4 @@ -package com.xiang.entity.pojo.xb; +package com.xiang.xservice.xb.entity.pojo.xb; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/pojo/xb/XbFundList.java b/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/XbFundList.java similarity index 90% rename from script/src/main/java/com/xiang/entity/pojo/xb/XbFundList.java rename to script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/XbFundList.java index ff8e9a0..cee6fc4 100644 --- a/script/src/main/java/com/xiang/entity/pojo/xb/XbFundList.java +++ b/script/src/main/java/com/xiang/xservice/xb/entity/pojo/xb/XbFundList.java @@ -1,4 +1,4 @@ -package com.xiang.entity.pojo.xb; +package com.xiang.xservice.xb.entity.pojo.xb; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/request/xb/fund/QueryFundInfoReq.java b/script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryFundInfoReq.java similarity index 72% rename from script/src/main/java/com/xiang/entity/request/xb/fund/QueryFundInfoReq.java rename to script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryFundInfoReq.java index d4676bd..c28f0d8 100644 --- a/script/src/main/java/com/xiang/entity/request/xb/fund/QueryFundInfoReq.java +++ b/script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryFundInfoReq.java @@ -1,4 +1,4 @@ -package com.xiang.entity.request.xb.fund; +package com.xiang.xservice.xb.entity.request.xb.fund; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/request/xb/fund/QueryFundListReq.java b/script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryFundListReq.java similarity index 83% rename from script/src/main/java/com/xiang/entity/request/xb/fund/QueryFundListReq.java rename to script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryFundListReq.java index d379e38..d6fa798 100644 --- a/script/src/main/java/com/xiang/entity/request/xb/fund/QueryFundListReq.java +++ b/script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryFundListReq.java @@ -1,4 +1,4 @@ -package com.xiang.entity.request.xb.fund; +package com.xiang.xservice.xb.entity.request.xb.fund; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/request/xb/fund/QueryXbFundListReq.java b/script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryXbFundListReq.java similarity index 72% rename from script/src/main/java/com/xiang/entity/request/xb/fund/QueryXbFundListReq.java rename to script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryXbFundListReq.java index 4df3623..ea797fc 100644 --- a/script/src/main/java/com/xiang/entity/request/xb/fund/QueryXbFundListReq.java +++ b/script/src/main/java/com/xiang/xservice/xb/entity/request/xb/fund/QueryXbFundListReq.java @@ -1,4 +1,4 @@ -package com.xiang.entity.request.xb.fund; +package com.xiang.xservice.xb.entity.request.xb.fund; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/response/xbyj/fund/FundInfo.java b/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/FundInfo.java similarity index 92% rename from script/src/main/java/com/xiang/entity/response/xbyj/fund/FundInfo.java rename to script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/FundInfo.java index 55c30f8..93a3fae 100644 --- a/script/src/main/java/com/xiang/entity/response/xbyj/fund/FundInfo.java +++ b/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/FundInfo.java @@ -1,4 +1,4 @@ -package com.xiang.entity.response.xbyj.fund; +package com.xiang.xservice.xb.entity.response.xbyj.fund; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/response/xbyj/fund/FundList.java b/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/FundList.java similarity index 87% rename from script/src/main/java/com/xiang/entity/response/xbyj/fund/FundList.java rename to script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/FundList.java index 6351408..654efa0 100644 --- a/script/src/main/java/com/xiang/entity/response/xbyj/fund/FundList.java +++ b/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/FundList.java @@ -1,4 +1,4 @@ -package com.xiang.entity.response.xbyj.fund; +package com.xiang.xservice.xb.entity.response.xbyj.fund; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/response/xbyj/fund/QueryFundInfoResponse.java b/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/QueryFundInfoResponse.java similarity index 77% rename from script/src/main/java/com/xiang/entity/response/xbyj/fund/QueryFundInfoResponse.java rename to script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/QueryFundInfoResponse.java index 4cff4f7..ac771ae 100644 --- a/script/src/main/java/com/xiang/entity/response/xbyj/fund/QueryFundInfoResponse.java +++ b/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/QueryFundInfoResponse.java @@ -1,4 +1,4 @@ -package com.xiang.entity.response.xbyj.fund; +package com.xiang.xservice.xb.entity.response.xbyj.fund; import lombok.Data; diff --git a/script/src/main/java/com/xiang/entity/response/xbyj/fund/QueryFundListResponse.java b/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/QueryFundListResponse.java similarity index 80% rename from script/src/main/java/com/xiang/entity/response/xbyj/fund/QueryFundListResponse.java rename to script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/QueryFundListResponse.java index 352a328..595d469 100644 --- a/script/src/main/java/com/xiang/entity/response/xbyj/fund/QueryFundListResponse.java +++ b/script/src/main/java/com/xiang/xservice/xb/entity/response/xbyj/fund/QueryFundListResponse.java @@ -1,4 +1,4 @@ -package com.xiang.entity.response.xbyj.fund; +package com.xiang.xservice.xb.entity.response.xbyj.fund; import lombok.Data; diff --git a/script/src/main/java/com/xiang/repository/XBFundMapper.java b/script/src/main/java/com/xiang/xservice/xb/repository/XBFundMapper.java similarity index 70% rename from script/src/main/java/com/xiang/repository/XBFundMapper.java rename to script/src/main/java/com/xiang/xservice/xb/repository/XBFundMapper.java index 7d31b71..fa91778 100644 --- a/script/src/main/java/com/xiang/repository/XBFundMapper.java +++ b/script/src/main/java/com/xiang/xservice/xb/repository/XBFundMapper.java @@ -1,8 +1,8 @@ -package com.xiang.repository; +package com.xiang.xservice.xb.repository; -import com.xiang.entity.pojo.xb.FundInfo; -import com.xiang.entity.pojo.xb.XbFundCount; -import com.xiang.entity.pojo.xb.XbFundList; +import com.xiang.xservice.xb.entity.pojo.xb.FundInfo; +import com.xiang.xservice.xb.entity.pojo.xb.XbFundCount; +import com.xiang.xservice.xb.entity.pojo.xb.XbFundList; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/script/src/main/java/com/xiang/schedule/jntyzx/QueryVenueJob.java b/script/src/main/java/com/xiang/xservice/xb/schedule/jntyzx/QueryVenueJob.java similarity index 84% rename from script/src/main/java/com/xiang/schedule/jntyzx/QueryVenueJob.java rename to script/src/main/java/com/xiang/xservice/xb/schedule/jntyzx/QueryVenueJob.java index 46da6b6..4bd7e10 100644 --- a/script/src/main/java/com/xiang/schedule/jntyzx/QueryVenueJob.java +++ b/script/src/main/java/com/xiang/xservice/xb/schedule/jntyzx/QueryVenueJob.java @@ -1,6 +1,6 @@ -package com.xiang.schedule.jntyzx; +package com.xiang.xservice.xb.schedule.jntyzx; -import com.xiang.service.JntyzxService; +import com.xiang.xservice.jntyzx.service.JntyzxService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/script/src/main/java/com/xiang/schedule/xb/FundCountJob.java b/script/src/main/java/com/xiang/xservice/xb/schedule/xb/FundCountJob.java similarity index 92% rename from script/src/main/java/com/xiang/schedule/xb/FundCountJob.java rename to script/src/main/java/com/xiang/xservice/xb/schedule/xb/FundCountJob.java index 59b9ae9..0cc9e02 100644 --- a/script/src/main/java/com/xiang/schedule/xb/FundCountJob.java +++ b/script/src/main/java/com/xiang/xservice/xb/schedule/xb/FundCountJob.java @@ -1,12 +1,12 @@ -package com.xiang.schedule.xb; +package com.xiang.xservice.xb.schedule.xb; import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Lists; -import com.xiang.dingTalk.service.DingTalkService; -import com.xiang.entity.pojo.xb.XbFundCount; -import com.xiang.entity.pojo.xb.XbFundList; -import com.xiang.entity.response.xbyj.fund.FundList; -import com.xiang.service.FundService; +import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; +import com.xiang.xservice.xb.entity.pojo.xb.XbFundCount; +import com.xiang.xservice.xb.entity.pojo.xb.XbFundList; +import com.xiang.xservice.xb.entity.response.xbyj.fund.FundList; +import com.xiang.xservice.xb.service.FundService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/script/src/main/java/com/xiang/schedule/xb/FundInfoQueryJob.java b/script/src/main/java/com/xiang/xservice/xb/schedule/xb/FundInfoQueryJob.java similarity index 90% rename from script/src/main/java/com/xiang/schedule/xb/FundInfoQueryJob.java rename to script/src/main/java/com/xiang/xservice/xb/schedule/xb/FundInfoQueryJob.java index 844adf1..2999aaf 100644 --- a/script/src/main/java/com/xiang/schedule/xb/FundInfoQueryJob.java +++ b/script/src/main/java/com/xiang/xservice/xb/schedule/xb/FundInfoQueryJob.java @@ -1,15 +1,15 @@ -package com.xiang.schedule.xb; +package com.xiang.xservice.xb.schedule.xb; import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Lists; -import com.xiang.common.factory.xb.QueryThreadFactory; -import com.xiang.dingTalk.service.DingTalkService; -import com.xiang.entity.pojo.xb.FundMessage; -import com.xiang.entity.pojo.xb.XbFundList; -import com.xiang.entity.response.xbyj.fund.FundInfo; -import com.xiang.entity.response.xbyj.fund.FundList; -import com.xiang.repository.XBFundMapper; -import com.xiang.service.FundService; +import com.xiang.xservice.basic.config.MyThreadFactory; +import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; +import com.xiang.xservice.xb.entity.pojo.xb.FundMessage; +import com.xiang.xservice.xb.entity.pojo.xb.XbFundList; +import com.xiang.xservice.xb.entity.response.xbyj.fund.FundInfo; +import com.xiang.xservice.xb.entity.response.xbyj.fund.FundList; +import com.xiang.xservice.xb.repository.XBFundMapper; +import com.xiang.xservice.xb.service.FundService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -55,7 +55,7 @@ public class FundInfoQueryJob { 1000, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), - new QueryThreadFactory("xb-query-thread", Boolean.TRUE), + new MyThreadFactory("xb-query-thread", Boolean.TRUE), new ThreadPoolExecutor.AbortPolicy()); @Value("${xiaobei.codeArr}") private String codeArr; @@ -172,14 +172,14 @@ public class FundInfoQueryJob { Objects.equals(LocalDateTime.now().getDayOfWeek(), DayOfWeek.SUNDAY)) { return; } - List fundInfos = xbFundMapper.queryListIn2Min(); + List fundInfos = xbFundMapper.queryListIn2Min(); if (CollectionUtils.isEmpty(fundInfos)) { return; } - Map> map = fundInfos.stream().collect(Collectors.groupingBy(com.xiang.entity.pojo.xb.FundInfo::getCode)); + Map> map = fundInfos.stream().collect(Collectors.groupingBy(com.xiang.xservice.xb.entity.pojo.xb.FundInfo::getCode)); StringBuffer sb = new StringBuffer(); map.entrySet().parallelStream().forEach(entry -> { - List infos = entry.getValue(); + List infos = entry.getValue(); BigDecimal sum = new BigDecimal("0"); for (int i = 0; i < infos.size() - 1; i++) { BigDecimal subtract = new BigDecimal(infos.get(i + 1).getChange()).subtract(new BigDecimal(infos.get(i).getChange())); @@ -210,12 +210,12 @@ public class FundInfoQueryJob { return; } List futures = Lists.newArrayList(); - List fundInfoList = Lists.newCopyOnWriteArrayList(); + List fundInfoList = Lists.newCopyOnWriteArrayList(); fundMessageList.parallelStream().forEach(fundMessage -> { CompletableFuture future = CompletableFuture.runAsync(() -> { FundInfo fundInfo = fundService.queryFundInfo(fundMessage.getCode()); - com.xiang.entity.pojo.xb.FundInfo info = com.xiang.entity.pojo.xb.FundInfo.builder() + com.xiang.xservice.xb.entity.pojo.xb.FundInfo info = com.xiang.xservice.xb.entity.pojo.xb.FundInfo.builder() .code(fundMessage.getCode()) .name(fundInfo.getName()) .change(fundMessage.getChange().multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP).toString()) diff --git a/script/src/main/java/com/xiang/service/FundService.java b/script/src/main/java/com/xiang/xservice/xb/service/FundService.java similarity index 70% rename from script/src/main/java/com/xiang/service/FundService.java rename to script/src/main/java/com/xiang/xservice/xb/service/FundService.java index 1ce441c..277b01c 100644 --- a/script/src/main/java/com/xiang/service/FundService.java +++ b/script/src/main/java/com/xiang/xservice/xb/service/FundService.java @@ -1,9 +1,9 @@ -package com.xiang.service; +package com.xiang.xservice.xb.service; -import com.xiang.entity.pojo.xb.XbFundCount; -import com.xiang.entity.pojo.xb.XbFundList; -import com.xiang.entity.response.xbyj.fund.FundInfo; -import com.xiang.entity.response.xbyj.fund.FundList; +import com.xiang.xservice.xb.entity.pojo.xb.XbFundCount; +import com.xiang.xservice.xb.entity.pojo.xb.XbFundList; +import com.xiang.xservice.xb.entity.response.xbyj.fund.FundInfo; +import com.xiang.xservice.xb.entity.response.xbyj.fund.FundList; import java.util.List; diff --git a/script/src/main/java/com/xiang/service/FundServiceImpl.java b/script/src/main/java/com/xiang/xservice/xb/service/FundServiceImpl.java similarity index 82% rename from script/src/main/java/com/xiang/service/FundServiceImpl.java rename to script/src/main/java/com/xiang/xservice/xb/service/FundServiceImpl.java index 483c597..d43e741 100644 --- a/script/src/main/java/com/xiang/service/FundServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/xb/service/FundServiceImpl.java @@ -1,16 +1,16 @@ -package com.xiang.service; +package com.xiang.xservice.xb.service; import com.alibaba.fastjson2.JSONObject; import com.google.common.collect.Lists; -import com.xiang.common.URLConstants; -import com.xiang.entity.pojo.xb.XbFundCount; -import com.xiang.entity.pojo.xb.XbFundList; -import com.xiang.entity.response.xbyj.fund.FundInfo; -import com.xiang.entity.response.xbyj.fund.FundList; -import com.xiang.entity.response.xbyj.fund.QueryFundInfoResponse; -import com.xiang.entity.response.xbyj.fund.QueryFundListResponse; -import com.xiang.repository.XBFundMapper; -import com.xiang.utils.HttpUtils; +import com.xiang.xservice.basic.utils.HttpUtils; +import com.xiang.xservice.xb.common.URLConstants; +import com.xiang.xservice.xb.entity.pojo.xb.XbFundCount; +import com.xiang.xservice.xb.entity.pojo.xb.XbFundList; +import com.xiang.xservice.xb.entity.response.xbyj.fund.FundInfo; +import com.xiang.xservice.xb.entity.response.xbyj.fund.FundList; +import com.xiang.xservice.xb.entity.response.xbyj.fund.QueryFundInfoResponse; +import com.xiang.xservice.xb.entity.response.xbyj.fund.QueryFundListResponse; +import com.xiang.xservice.xb.repository.XBFundMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -32,7 +32,6 @@ import java.util.stream.Collectors; @Slf4j public class FundServiceImpl implements FundService{ - private final HttpUtils httpUtils; private final XBFundMapper xbFundMapper; @@ -61,7 +60,7 @@ public class FundServiceImpl implements FundService{ String resp = ""; try { - resp = httpUtils.doPost(URLConstants.XB_QUERY_LIST, null, JSONObject.toJSONString(json)); + resp = HttpUtils.doPost(URLConstants.XB_QUERY_LIST, null, JSONObject.toJSONString(json)); log.info("[基金列表查询] 查询成功， 请求地址:{}, 请求参数：{}, 请求结果：{}", URLConstants.XB_QUERY_LIST, JSONObject.toJSONString(json), resp); if (StringUtils.isNotBlank(resp)) { QueryFundListResponse response = JSONObject.parseObject(resp, QueryFundListResponse.class); @@ -82,7 +81,7 @@ public class FundServiceImpl implements FundService{ JSONObject jsonObject = new JSONObject(); jsonObject.put("code", code); jsonObject.put("unionId", unionId); - String resp = httpUtils.doPost(URLConstants.XB_QUERY_FUND_INFO, null, JSONObject.toJSONString(jsonObject)); + String resp = HttpUtils.doPost(URLConstants.XB_QUERY_FUND_INFO, null, JSONObject.toJSONString(jsonObject)); if (StringUtils.isNotBlank(resp)) { log.info("[小蓓养基] 基金详情查询：请求参数:{}, 请求结果:{}", JSONObject.toJSONString(jsonObject), resp); QueryFundInfoResponse response = JSONObject.parseObject(resp, QueryFundInfoResponse.class); diff --git a/script/src/main/resources/application-nas.yml b/script/src/main/resources/application-nas.yml new file mode 100644 index 0000000..dcfef97 --- /dev/null +++ b/script/src/main/resources/application-nas.yml @@ -0,0 +1,12 @@ +spring: + datasource: + url: jdbc:mysql://192.168.2.10:3306/xservice-script?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true + username: root + password: Admin@123 + driver-class-name: com.mysql.cj.jdbc.Driver + +aliyun: + dns: + RR: + - client + - file \ No newline at end of file diff --git a/script/src/main/resources/mapper/GladosMapper.xml b/script/src/main/resources/mapper/glados/GladosMapper.xml similarity index 81% rename from script/src/main/resources/mapper/GladosMapper.xml rename to script/src/main/resources/mapper/glados/GladosMapper.xml index 8b50ffb..966c242 100644 --- a/script/src/main/resources/mapper/GladosMapper.xml +++ b/script/src/main/resources/mapper/glados/GladosMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -18,7 +18,7 @@ status - + insert into scirpt_glados_run(time, status, response, user, user_id, code) values (#{time}, #{status}, #{response}, #{user}, #{userId}, #{code}) diff --git a/script/src/main/resources/mapper/XBFundMapper.xml b/script/src/main/resources/mapper/xb/XBFundMapper.xml similarity index 85% rename from script/src/main/resources/mapper/XBFundMapper.xml rename to script/src/main/resources/mapper/xb/XBFundMapper.xml index a73efe1..09effde 100644 --- a/script/src/main/resources/mapper/XBFundMapper.xml +++ b/script/src/main/resources/mapper/xb/XBFundMapper.xml @@ -1,16 +1,16 @@ - + - + - + @@ -50,7 +50,7 @@ and type = #{type} - select * from xb_fund_count where update_time between NOW() - INTERVAL 7 DAY and NOW()