Prechádzať zdrojové kódy

增加清能一体化外网模块

xusl 2 rokov pred
rodič
commit
26f00cf8f2

+ 5 - 0
in-client-qn/README.md

@@ -0,0 +1,5 @@
+外网清能一体化
+============================================
+
+
+----------------------------------------------------------------------------

+ 88 - 0
in-client-qn/pom.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>insu</artifactId>
+        <groupId>com.jiayue</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>in-client-qn</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.jiayue</groupId>
+            <artifactId>in-common-core</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.projectlombok</groupId>-->
+<!--            <artifactId>lombok</artifactId>-->
+<!--            <optional>true</optional>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-test</artifactId>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+
+
+        <!--必备: 注册中心客户端-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <!--必备: 配置中心客户端-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>${mybatis.plus.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.7.15</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.11</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>2.10.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+    </dependencies>
+</project>

+ 42 - 0
in-client-qn/src/main/java/com/jiayue/insu/inclientqn/InClientQnApplication.java

@@ -0,0 +1,42 @@
+package com.jiayue.insu.inclientqn;
+
+import net.sf.ehcache.CacheManager;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.ehcache.EhCacheCacheManager;
+import org.springframework.cache.ehcache.EhCacheManagerFactoryBean;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.io.ClassPathResource;
+
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableCaching
+public class InClientQnApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(InClientQnApplication.class, args);
+    }
+
+
+    /**
+     * ecache缓存对象获取
+     */
+    @Bean
+    public EhCacheCacheManager cacheManager(CacheManager cacheManagerFactory) {
+        EhCacheCacheManager ehCacheCacheManager = new EhCacheCacheManager();
+        ehCacheCacheManager.setCacheManager(cacheManagerFactory);
+        return ehCacheCacheManager;
+    }
+
+    /**
+     * ecache缓存配置加载
+     */
+    @Bean
+    public EhCacheManagerFactoryBean cacheManagerFactory() {
+        EhCacheManagerFactoryBean ehCacheManagerFactoryBean = new EhCacheManagerFactoryBean();
+        ehCacheManagerFactoryBean.setConfigLocation(new ClassPathResource("ehcache-setting.xml"));
+        return ehCacheManagerFactoryBean;
+    }
+
+}

+ 119 - 0
in-client-qn/src/main/java/com/jiayue/insu/inclientqn/constant/StatusConstant.java

@@ -0,0 +1,119 @@
+package com.jiayue.insu.inclientqn.constant;
+
+/**
+ * @description: 状态常量
+ * @author: yuanhao
+ * @createDate: 2021/8/20
+ * @version: 1.0
+ */
+public class StatusConstant {
+
+    /**
+     *  请求成功
+     */
+    public static String REQUEST_SUCCESS = "T200";
+    /**
+     * token已过期
+     */
+    public static String TOKEN_EXPIRE = "I101";
+    /**
+     * 无效token
+     */
+    public static String TOKEN_INVALID = "I102";
+
+    /**
+     * 签名失败
+     */
+    public static String AUTOGRAPH_FAIL ="I103";
+
+    /**
+     * 用户未登录,请先登录
+     */
+    public static String LOGIN_NOT ="I104";
+
+    /**
+     * 返回非json格式
+     */
+    public static String RESPONSE_ERROR1="E500";
+    /**
+     * 返回空
+     */
+    public static String RESPONSE_ERROR2="E600";
+    /**
+     * 链接超时断开
+     */
+    public static String RESPONSE_ERROR3="E700";
+    /**
+     * 未请求到token
+     */
+    public static String RESPONSE_ERROR4="E800";
+
+
+
+    /**
+     * 上午
+     */
+    public static String AM_DAY ="AM";
+    /**
+     * 下午
+     */
+    public static String PM_DAY = "PM";
+
+    /**
+     * 初始化数据下载成功
+     */
+    public static String INIT_STATUS_SUCCESS ="SUCCESS";
+    /**
+     * 请求初始化文件失败
+     */
+    public static String INIT_STATUS_REQUEST_FAIL="REQUEST_FAIL";
+    /**
+     * 请求初始化文件返回响应失败
+     */
+    public static String INIT_STATUS_RESPONSE_FAIL="RESPONSE_FAIL";
+    /**
+     * 查无初始化文件
+     */
+    public static String INIT_STATUS_FILE_NULL ="FILE_NULL";
+    /**
+     * 请求初始化文件列表失败
+     */
+    public static String INIT_STATUS_FAIL = "FAIL";
+
+
+
+    /**
+     * 下载初始化文件错误
+     */
+    public static String INIT_STATUS_FILE_FAIL ="FILE_NULL_ERROE";
+
+
+    /**
+     * 上送数据缺少
+     */
+    public static String UPLOAD_STATUS_DATA_LACK="DATA_LACK";
+    /**
+     * 修正数据缺少
+     */
+    public static String Correct_STATUS_DATA_LACK="DATA_LACK";
+
+    /**
+     * 解析失败或没有修正完成
+     */
+    public static String Correct_STATUS_DATA_FAIL="DATA_FAIL";
+
+
+    public static String AMEND_GEN_FILE_SUCCESS="SUCCESS";
+
+    public static String AMEND_GEN_FILE_ERROE="GEN_ERROR";
+
+    public static String AMEND_FILE_MONIL_ERROR="UPLOAD_ERROR";
+
+    public static String ET_PHOTOVOLTAIC = "E1";
+
+    public static String ET_WIND = "E2";
+
+
+
+
+}

+ 43 - 0
in-client-qn/src/main/java/com/jiayue/insu/inclientqn/entity/TokenInfo.java

@@ -0,0 +1,43 @@
+package com.jiayue.insu.inclientqn.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * token信息
+ *
+ * @author xsl
+ * @date 2022-04-12 19:33:02
+ */
+@Data
+@TableName("token_info")
+public class TokenInfo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+    /**
+     * 用户名
+     */
+    private String username;
+    /**
+     * 密码
+     */
+    private String password;
+	/**
+     * token_url
+     */
+    private String tokenurl;
+	/**
+     * downloadUrl
+     */
+    private String downloadurl;
+}

+ 16 - 0
in-client-qn/src/main/java/com/jiayue/insu/inclientqn/mapper/TokenInfoMapper.java

@@ -0,0 +1,16 @@
+package com.jiayue.insu.inclientqn.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jiayue.insu.inclientqn.entity.TokenInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * token信息mapper
+ *
+ * @author xsl
+ * @date 2022-04-12 19:33:02
+ */
+@Mapper
+public interface TokenInfoMapper extends BaseMapper<TokenInfo> {
+
+}

+ 39 - 0
in-client-qn/src/main/java/com/jiayue/insu/inclientqn/model/ElVo.java

@@ -0,0 +1,39 @@
+package com.jiayue.insu.inclientqn.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * @description: 一体化请求VO
+ * @author: yuanhao
+ * @createDate: 2021/8/24
+ * @version: 1.0
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ElVo {
+    /**
+     * 运维标识
+     */
+    private String stationCode;
+    /**
+     * 场站代号
+     */
+    private String signCode;
+    /**
+     * 场站类型   E1 光伏  E2 风电
+     */
+    private String type;
+    /**
+     * token
+     */
+    private String user;
+
+
+
+
+}

+ 59 - 0
in-client-qn/src/main/java/com/jiayue/insu/inclientqn/model/FileCreateLog.java

@@ -0,0 +1,59 @@
+package com.jiayue.insu.inclientqn.model;
+
+import lombok.Data;
+
+/**
+ * 文件生成列表
+ *
+ * @author bizy
+ * @version 3.0
+ */
+@Data
+public class FileCreateLog {
+    private String id;
+
+    /**
+     * 场站编码
+     */
+    private String stationCode;
+
+    /**
+     * 场站名称
+     */
+    private String stationName;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 文件存放路径
+     */
+    private String filePath;
+
+    /**
+     * 日期
+     */
+    private String fileDate;
+
+    /**
+     * 是否下载
+     */
+    private String fileDownLoadStatus;
+
+    /**
+     * 是否传入内网
+     */
+    private String fileInStatus;
+
+    /**
+     * 下载到外网的方式
+     */
+    private String fileDownLoadType;
+
+    /**
+     * 文件类型
+     */
+    private String fileType;
+}

+ 29 - 0
in-client-qn/src/main/java/com/jiayue/insu/inclientqn/model/Projects.java

@@ -0,0 +1,29 @@
+package com.jiayue.insu.inclientqn.model;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: yuanhao
+ * @createDate: 2021/9/27
+ * @version: 1.0
+ */
+@Configuration
+@ConfigurationProperties(prefix = "allinone")
+@Data
+public class Projects {
+
+    public static List<ElVo> els;   //static 才能拿配置值
+
+    public static List<ElVo> getEls() {
+        return els;
+    }
+
+    public void setEls(List<ElVo> list) {
+        Projects.els = list;
+    }
+}

+ 46 - 0
in-client-qn/src/main/java/com/jiayue/insu/inclientqn/model/RequestVo.java

@@ -0,0 +1,46 @@
+package com.jiayue.insu.inclientqn.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * @description: 一体化请求VO
+ * @author: yuanhao
+ * @createDate: 2021/8/24
+ * @version: 1.0
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RequestVo {
+
+    /**
+     * 数据传输类型
+     */
+    private String transferType;
+
+    /**
+     * 日期
+     */
+    private String date;
+    /**
+     * 数据类型
+     */
+    private String dataType;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 数据
+     */
+    private String data;
+
+
+
+}

+ 33 - 0
in-client-qn/src/main/java/com/jiayue/insu/inclientqn/model/ResponseVo.java

@@ -0,0 +1,33 @@
+package com.jiayue.insu.inclientqn.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * @description: 一体化响应VO
+ * @author: yuanhao
+ * @createDate: 2021/8/24
+ * @version: 1.0
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ResponseVo {
+
+    /**
+     * 响应码
+     */
+    private String retCode;
+    /**
+     * 响应信息
+     */
+    private String retMsg;
+
+    /**
+     * 响应数据
+     */
+    private String data;
+}

+ 23 - 0
in-client-qn/src/main/java/com/jiayue/insu/inclientqn/model/TokenVo.java

@@ -0,0 +1,23 @@
+package com.jiayue.insu.inclientqn.model;
+
+import lombok.Data;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @author: yuanhao
+ * @createDate: 2021/8/23
+ * @version: 1.0
+ */
+@Data
+@SuperBuilder
+public class TokenVo implements Serializable {
+
+    private String requestTime;
+
+    private String expirationTime;
+
+    private String tokenInfo;
+}

+ 93 - 0
in-client-qn/src/main/java/com/jiayue/insu/inclientqn/service/InTokenService.java

@@ -0,0 +1,93 @@
+package com.jiayue.insu.inclientqn.service;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONUtil;
+import com.jiayue.insu.inclientqn.constant.StatusConstant;
+import com.jiayue.insu.inclientqn.entity.TokenInfo;
+import com.jiayue.insu.inclientqn.model.ResponseVo;
+import com.jiayue.insu.inclientqn.model.TokenVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.util.DigestUtils;
+
+import java.util.List;
+
+
+/**
+ * @description: 获取token
+ * @author: yuanhao
+ * @createDate: 2021/8/19
+ * @version: 1.0
+ */
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class InTokenService {
+    @Autowired
+    TokenInfoService tokenInfoService;
+    @Value("${stationCode}")
+    private String stationCode;
+
+    /**
+     * 获取清能一体化交互的token
+     * @return
+     */
+    @Cacheable(value = "intoken" ,key = "'qntoken'")
+    public TokenVo getToken() {
+        List<TokenInfo> tokenInfoList = tokenInfoService.queryTokenInfo();
+        TokenVo tokenVo = null;
+        if (!tokenInfoList.isEmpty()) {
+            TokenInfo tokenInfo = tokenInfoList.get(0);
+            String username = tokenInfo.getUsername();
+            String password = tokenInfo.getPassword();
+            String passwordMD5 = DigestUtils.md5DigestAsHex(password.getBytes()).toUpperCase();
+            String auth = username + ":" + passwordMD5;
+            String tokenUrl = tokenInfo.getTokenurl();
+            String response = null;
+            String token = null;
+            String requestTime = DateUtil.now();
+            String expirationTime = DateUtil.offsetDay(DateUtil.parse(requestTime), 1).toString();
+            try {
+                HttpRequest httpRequest = HttpRequest.post(tokenUrl)
+                        .header("Content-Type", "application/json")
+                        .header("Authorization", auth);
+                httpRequest.setGlobalTimeout(5000);
+                response = httpRequest.execute().body();
+                if (StringUtils.isNotEmpty(response)) {
+                    boolean isJson = JSONUtil.isJsonObj(response);
+                    if (isJson) {
+                        JSON resultJson = JSONUtil.parse(response);
+                        ResponseVo responseVo = JSONUtil.toBean(response, ResponseVo.class);
+                        if (responseVo.getRetCode().equals(StatusConstant.REQUEST_SUCCESS)) {
+                            token = responseVo.getData();
+                            tokenVo = TokenVo.builder().requestTime(requestTime)
+                                    .expirationTime(expirationTime)
+                                    .tokenInfo(token)
+                                    .build();
+                            log.info("========== 一体化token请求成功: {} token=" + token + "  ==========", stationCode);
+                        } else {
+                            log.error("========== 一体化token请求异常: {} 接收retCode响应码非成功标识T200 标识为" + resultJson.getByPath("retCode") + " " + resultJson.getByPath("retMsg") + " ==========", stationCode);
+                            log.info("========== 请求参数 账号密码:" + username + ":" + password + " MD5加密:" + auth + " ==========");
+                        }
+                    } else {
+                        log.error("========== 一体化token请求异常: {} 接收响应字符串非json格式 ==========", stationCode);
+                    }
+                } else {
+                    log.error("========== 一体化token请求异常: {} 接收响应字符串为空 ==========", stationCode);
+                }
+            } catch (Exception e) {
+                log.error("========== 一体化token请求异常: {} 连接断开或请求超时 ==========", stationCode);
+                e.printStackTrace();
+            }
+        }
+        return tokenVo;
+    }
+}

+ 65 - 0
in-client-qn/src/main/java/com/jiayue/insu/inclientqn/service/TokenInfoService.java

@@ -0,0 +1,65 @@
+package com.jiayue.insu.inclientqn.service;
+
+import com.jiayue.insu.inclientqn.entity.TokenInfo;
+import com.jiayue.insu.inclientqn.mapper.TokenInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.Element;
+import net.sf.ehcache.search.Attribute;
+import net.sf.ehcache.search.Query;
+import net.sf.ehcache.search.Result;
+import net.sf.ehcache.search.Results;
+import org.springframework.cache.ehcache.EhCacheCacheManager;
+
+/**
+ * token信息服务类
+ *
+ * @author xsl
+ * @version 3.0
+ */
+@Service
+public class TokenInfoService {
+    @Autowired
+    TokenInfoMapper tokenInfoMapper;
+    @Autowired
+    EhCacheCacheManager ehCacheCacheManager;
+
+    public List<TokenInfo> queryTokenInfo(){
+        Cache cache = ehCacheCacheManager.getCacheManager().getCache("sysinfo");
+        Query query = cache.createQuery();
+        //查询结果中包含Key和value
+        query.includeKeys().includeValues();
+        Attribute<String> keyName = cache.getSearchAttribute("key");
+        query.addCriteria(keyName.ilike("*tokeninfo*"));
+        Results results = query.execute();
+        List<Result> resultList = results.all();
+
+        List<TokenInfo> list = new ArrayList();
+        if (resultList != null && !resultList.isEmpty()) {
+            System.out.println("查询缓存tokeninfo");
+            for (Result result : resultList) {
+                TokenInfo e = (TokenInfo) result.getValue();
+                list.add(e);
+            }
+            results.discard();
+        } else {
+            System.out.println("查询数据库tokeninfo");
+            // 缓存没有值,查询数据库
+            list = tokenInfoMapper.selectList(null);
+            for (TokenInfo tokenInfo : list) {
+                //将结果存入缓存
+                cache.put(new Element("tokeninfo" + tokenInfo.getId(), tokenInfo));
+            }
+        }
+        return list;
+    }
+}

+ 31 - 0
in-client-qn/src/main/resources/bootstrap.yml

@@ -0,0 +1,31 @@
+stationCode: T00001
+spring:
+  application:
+    name: ${stationCode}-insu-qn
+  profiles:
+    active: dev
+
+server:
+  port: 9100
+---
+spring:
+  config:
+    activate:
+      on-profile: dev
+
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 192.168.1.205:8320
+        namespace: insu
+
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+        file-extension: yml
+        namespace: insu
+
+management:
+  endpoint:
+    web:
+      exposure:
+        include: '*'

+ 28 - 0
in-client-qn/src/main/resources/ehcache-setting.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ehcache>
+  <!-- 指定一个文件目录,当EhCache把数据写到硬盘上时,将把数据写到这个文件目录下 -->
+  <diskStore path="java.io.tmpdir"/>
+
+  <defaultCache eternal="false"
+                maxElementsInMemory="10000"
+                overflowToDisk="true"
+                diskPersistent="false"
+   />
+  <!-- 保存一体化token,6小时失效 -->
+  <cache name="intoken"
+         eternal="false"
+         maxElementsInMemory="10000"
+         overflowToDisk="false"
+         diskPersistent="false"
+         timeToIdleSeconds="21600"
+         timeToLiveSeconds="21600"
+   />
+  <!-- 永不失效的缓存 -->
+  <cache name="sysinfo"
+         eternal="true"
+         maxElementsInMemory="10000"
+         overflowToDisk="false"
+         diskPersistent="false">
+    <searchable/>
+  </cache>
+</ehcache>

+ 15 - 0
in-client-qn/src/main/resources/mapper/TokenInfoMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.jiayue.insu.inclientqn.mapper.TokenInfoMapper">
+
+  <resultMap id="tokenInfoMap" type="com.jiayue.insu.inclientqn.entity.TokenInfo">
+                  <id property="id" column="id"/>
+                        <result property="username" column="username"/>
+                        <result property="password" column="password"/>
+                        <result property="tokenurl" column="tokenurl"/>
+                        <result property="downloadurl" column="downloadurl"/>
+            </resultMap>
+</mapper>

+ 0 - 40
in-client/pom.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>insu</artifactId>
-        <groupId>com.jiayue</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>in-client</artifactId>
-
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>

+ 2 - 2
pom.xml

@@ -11,7 +11,7 @@
     <version>1.0-SNAPSHOT</version>
     <modules>
         <module>in-cloud</module>
-        <module>in-client</module>
+        <module>in-client-qn</module>
         <module>in-passback</module>
         <module>in-common</module>
     </modules>
@@ -142,4 +142,4 @@
         </snapshotRepository>
     </distributionManagement>
 
-</project>
+</project>