Browse Source

20220112重新整理项目架构

master
zy_Java 4 years ago
parent
commit
f548c1c448
  1. 2
      cloudutil/pom.xml
  2. 4
      dh_diplomatist/src/main/resources/application.yml
  3. 196
      dh_diplomatist/src/main/resources/logback-spring.xml
  4. 84
      dh_ht/pom.xml
  5. 22
      dh_ht/src/main/java/com/ccsens/dh_ht/config/BeanConfig.java
  6. 128
      dh_ht/src/main/java/com/ccsens/dh_ht/config/SpringConfig.java
  7. 56
      dh_ht/src/main/java/com/ccsens/dh_ht/config/SwaggerConfigure.java
  8. 25
      dh_ht/src/main/java/com/ccsens/dh_ht/service/ProjectService.java
  9. 12
      dh_ht/src/main/java/com/ccsens/dh_ht/util/PtOsCodeError.java
  10. 50
      dh_ht/src/main/java/com/ccsens/dh_ht/util/PtOsConstant.java
  11. 50
      dh_ht/src/main/resources/application-dev.yml
  12. 40
      dh_ht/src/main/resources/application-prod.yml
  13. 48
      dh_ht/src/main/resources/application-test.yml
  14. 4
      dh_ht/src/main/resources/application.yml
  15. 33
      dh_ptos/.gitignore
  16. 322
      dh_ptos/mvnw
  17. 182
      dh_ptos/mvnw.cmd
  18. 31
      dh_ptos/src/main/java/com/ccsens/dh_ptos/DhPtosApplication.java
  19. 32
      dh_ptos/src/main/java/com/ccsens/dh_ptos/api/DebugController.java
  20. 41
      dh_ptos/src/main/java/com/ccsens/dh_ptos/api/ProjectController.java
  21. 18
      dh_ptos/src/main/java/com/ccsens/dh_ptos/api/UserController.java
  22. 22
      dh_ptos/src/main/java/com/ccsens/dh_ptos/bean/dto/ProjectDto.java
  23. 86
      dh_ptos/src/main/java/com/ccsens/dh_ptos/bean/vo/ProjectVo.java
  24. 159
      dh_ptos/src/main/java/com/ccsens/dh_ptos/intercept/MybatisInterceptor.java
  25. 19
      dh_ptos/src/main/java/com/ccsens/dh_ptos/service/IProjectService.java
  26. 25
      dh_ptos/src/main/java/com/ccsens/dh_ptos/service/ProjectService.java
  27. 30
      dh_ptos/src/main/resources/application-common.yml
  28. 4
      dh_ptos/src/main/resources/application.yml
  29. 34
      dh_ptos/src/main/resources/druid-dev.yml
  30. 35
      dh_ptos/src/main/resources/druid-prod.yml
  31. 34
      dh_ptos/src/main/resources/druid-test.yml
  32. 62
      dh_ptos/src/main/resources/mybatis/mybatis-config.xml
  33. 8
      pom.xml
  34. 0
      ptos_diplomatist/.gitignore
  35. 0
      ptos_diplomatist/mvnw
  36. 0
      ptos_diplomatist/mvnw.cmd
  37. 8
      ptos_diplomatist/pom.xml
  38. 10
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/PotsDiplomatistApplication.java
  39. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/DebugController.java
  40. 10
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/DomainController.java
  41. 15
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/HeartbeatController.java
  42. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/UserController.java
  43. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/dto/HeartbeatDto.java
  44. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/dto/UserDto.java
  45. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcBusiness.java
  46. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcBusinessExample.java
  47. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomain.java
  48. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomainBusiness.java
  49. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomainBusinessExample.java
  50. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomainExample.java
  51. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUser.java
  52. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUserDomain.java
  53. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUserDomainExample.java
  54. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUserExample.java
  55. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/vo/DomainVo.java
  56. 4
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/config/BeanConfig.java
  57. 4
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/config/SpringConfig.java
  58. 4
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/config/SwaggerConfigure.java
  59. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/intercept/MybatisInterceptor.java
  60. 8
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/dao/IdcDomainDao.java
  61. 6
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcBusinessMapper.java
  62. 6
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcDomainBusinessMapper.java
  63. 6
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcDomainMapper.java
  64. 6
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcUserDomainMapper.java
  65. 6
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcUserMapper.java
  66. 14
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/DomainService.java
  67. 15
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/HeartbeatService.java
  68. 6
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/IDomainService.java
  69. 4
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/IHeartbeatService.java
  70. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/util/DiplomatistCodeError.java
  71. 2
      ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/util/DiplomatistConstant.java
  72. 0
      ptos_diplomatist/src/main/resources/application-common.yml
  73. 8
      ptos_diplomatist/src/main/resources/application-dev.yml
  74. 8
      ptos_diplomatist/src/main/resources/application-prod.yml
  75. 8
      ptos_diplomatist/src/main/resources/application-test.yml
  76. 4
      ptos_diplomatist/src/main/resources/application.yml
  77. 2
      ptos_diplomatist/src/main/resources/druid-dev.yml
  78. 0
      ptos_diplomatist/src/main/resources/druid-prod.yml
  79. 0
      ptos_diplomatist/src/main/resources/druid-test.yml
  80. 2
      ptos_diplomatist/src/main/resources/logback-spring.xml
  81. 12
      ptos_diplomatist/src/main/resources/mapper_dao/SPluginDao.xml
  82. 18
      ptos_diplomatist/src/main/resources/mapper_raw/IdcBusinessMapper.xml
  83. 18
      ptos_diplomatist/src/main/resources/mapper_raw/IdcDomainBusinessMapper.xml
  84. 18
      ptos_diplomatist/src/main/resources/mapper_raw/IdcDomainMapper.xml
  85. 18
      ptos_diplomatist/src/main/resources/mapper_raw/IdcUserDomainMapper.xml
  86. 18
      ptos_diplomatist/src/main/resources/mapper_raw/IdcUserMapper.xml
  87. 0
      ptos_diplomatist/src/main/resources/mybatis/mybatis-config.xml
  88. 0
      ptos_tall/.gitignore
  89. 0
      ptos_tall/mvnw
  90. 0
      ptos_tall/mvnw.cmd
  91. 8
      ptos_tall/pom.xml
  92. 8
      ptos_tall/src/main/java/com/ccsens/ptos_tall/PtosTallApplication.java
  93. 2
      ptos_tall/src/main/java/com/ccsens/ptos_tall/api/DebugController.java
  94. 14
      ptos_tall/src/main/java/com/ccsens/ptos_tall/api/ProjectController.java
  95. 2
      ptos_tall/src/main/java/com/ccsens/ptos_tall/api/UserController.java
  96. 2
      ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/dto/ProjectDto.java
  97. 183
      ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/po/SysBusiness.java
  98. 1161
      ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/po/SysBusinessExample.java
  99. 19
      ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/vo/ProjectVo.java
  100. 4
      ptos_tall/src/main/java/com/ccsens/ptos_tall/config/BeanConfig.java

2
cloudutil/pom.xml

@ -3,7 +3,7 @@
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>ccsens_dh</artifactId>
<artifactId>ccsens_ptos</artifactId>
<groupId>com.ccsens</groupId>
<version>1.0-SNAPSHOT</version>
</parent>

4
dh_diplomatist/src/main/resources/application.yml

@ -1,4 +0,0 @@
spring:
profiles:
active: dev
include: common, util-dev

196
dh_diplomatist/src/main/resources/logback-spring.xml

@ -1,196 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL,如果设置为WARN,则低于WARN的信息都不会输出 -->
<!-- scan:当此属性设置为true时,配置文件如果发生改变,将会被重新加载,默认值为true -->
<!-- scanPeriod:设置监测配置文件是否有修改的时间间隔,如果没有给出时间单位,默认单位是毫秒。当scan为true时,此属性生效。默认的时间间隔为1分钟。 -->
<!-- debug:当此属性设置为true时,将打印出logback内部日志信息,实时查看logback运行状态。默认值为false。 -->
<configuration scan="true" scanPeriod="10 seconds">
<!--<include resource="org/springframework/boot/logging/logback/base.xml" />-->
<contextName>logback</contextName>
<!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后,可以使“${}”来使用变量。 -->
<property name="log.path" value="/home/diplomatist/service/log/" />
<!-- 彩色日志 -->
<!-- 彩色日志依赖的渲染类 -->
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
<!-- 彩色日志格式 -->
<property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
<!--输出到控制台-->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<!--此日志appender是为开发使用,只配置最底级别,控制台输出的日志级别是大于或等于此级别的日志信息-->
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>info</level>
</filter>
<encoder>
<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
<!-- 设置字符集 -->
<charset>UTF-8</charset>
</encoder>
</appender>
<!--输出到文件-->
<!-- 时间滚动输出 level为 DEBUG 日志 -->
<appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<file>${log.path}/log_debug.log</file>
<!--日志文件输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset> <!-- 设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志归档 -->
<fileNamePattern>${log.path}/debug/log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文件只记录debug级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>debug</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 时间滚动输出 level为 INFO 日志 -->
<appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<file>${log.path}/log_info.log</file>
<!--日志文件输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset>
</encoder>
<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 每天日志归档路径以及格式 -->
<fileNamePattern>${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文件只记录info级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>info</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 时间滚动输出 level为 WARN 日志 -->
<appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<file>${log.path}/log_warn.log</file>
<!--日志文件输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文件只记录warn级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>warn</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 时间滚动输出 level为 ERROR 日志 -->
<appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<file>${log.path}/log_error.log</file>
<!--日志文件输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文件只记录ERROR级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!--
<logger>用来设置某一个包或者具体的某一个类的日志打印级别、
以及指定<appender><logger>仅有一个name属性,
一个可选的level和一个可选的addtivity属性。
name:用来指定受此logger约束的某一个包或者具体的某一个类。
level:用来设置打印级别,大小写无关:TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF,
还有一个特俗值INHERITED或者同义词NULL,代表强制执行上级的级别。
如果未设置此属性,那么当前logger将会继承上级的级别。
addtivity:是否向上级logger传递打印信息。默认是true。
-->
<!--<logger name="org.springframework.web" level="info"/>-->
<!--<logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>-->
<!--
使用mybatis的时候,sql语句是debug下才会打印,而这里我们只配置了info,所以想要查看sql语句的话,有以下两种操作:
第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql,不过这样日志那边会出现很多其他消息
第二种就是单独给dao下目录配置debug模式,代码如下,这样配置sql语句会打印,其他还是正常info级别:
-->
<!--
root节点是必选节点,用来指定最基础的日志输出级别,只有一个level属性
level:用来设置打印级别,大小写无关:TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF,
不能设置为INHERITED或者同义词NULL。默认是DEBUG
可以包含零个或多个元素,标识这个appender将会添加到这个logger。
-->
<!--开发环境:打印控制台-->
<springProfile name="dev">
<logger name="com.ccsens.ptpro.persist.*" level="debug"/>
</springProfile>
<root level="info">
<appender-ref ref="CONSOLE" />
<appender-ref ref="DEBUG_FILE" />
<appender-ref ref="INFO_FILE" />
<appender-ref ref="WARN_FILE" />
<appender-ref ref="ERROR_FILE" />
</root>
<!--生产环境:输出到文件-->
<!--<springProfile name="pro">-->
<!--<root level="info">-->
<!--<appender-ref ref="CONSOLE" />-->
<!--<appender-ref ref="DEBUG_FILE" />-->
<!--<appender-ref ref="INFO_FILE" />-->
<!--<appender-ref ref="ERROR_FILE" />-->
<!--<appender-ref ref="WARN_FILE" />-->
<!--</root>-->
<!--</springProfile>-->
</configuration>

84
dh_ht/pom.xml

@ -1,84 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>ccsens_dh</artifactId>
<groupId>com.ccsens</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>dh_ht</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>dh_ht</name>
<description>Demo project for Spring Boot</description>
<properties>
<java.version>1.8</java.version>
</properties>
<dependencies>
<!--cloud 工具类-->
<dependency>
<artifactId>cloudutil</artifactId>
<groupId>com.ccsens</groupId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.ccsens</groupId>
<artifactId>util</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<!--微信工具包-->
<dependency>
<artifactId>wechatutil</artifactId>
<groupId>com.ccsens</groupId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-maven-plugin</artifactId>
<version>1.3.7</version>
<configuration>
<configurationFile>${basedir}/src/main/resources/mbg.xml</configurationFile>
<overwrite>true</overwrite>
</configuration>
<dependencies>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.34</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>com.ccsens.dh_ht.DhHtApplication</mainClass>
<!--<skip>true</skip>-->
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

22
dh_ht/src/main/java/com/ccsens/dh_ht/config/BeanConfig.java

@ -1,22 +0,0 @@
package com.ccsens.dh_ht.config;
import com.ccsens.dh_ht.intercept.MybatisInterceptor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @description:
* @author: wuHuiJuan
* @create: 2019/12/03 18:01
*/
@Configuration
public class BeanConfig {
/**
* 注册拦截器
*/
@Bean
public MybatisInterceptor mybatisInterceptor() {
MybatisInterceptor interceptor = new MybatisInterceptor();
return interceptor;
}
}

128
dh_ht/src/main/java/com/ccsens/dh_ht/config/SpringConfig.java

@ -1,128 +0,0 @@
package com.ccsens.dh_ht.config;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.IdUtil;
import com.ccsens.util.config.DruidProps;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.StringHttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.servlet.config.annotation.*;
import javax.annotation.Resource;
import javax.sql.DataSource;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
import java.util.TimeZone;
@Configuration
public class SpringConfig implements WebMvcConfigurer {
@Resource
private DruidProps druidPropsUtil;
@Value("${spring.snowflake.workerId}")
private String workerId;
@Value("${spring.snowflake.datacenterId}")
private String datacenterId;
/**
* 配置Converter
* @return
*/
@Bean
public HttpMessageConverter<String> responseStringConverter() {
StringHttpMessageConverter converter = new StringHttpMessageConverter(
Charset.forName("UTF-8"));
return converter;
}
@Bean
public HttpMessageConverter<Object> responseJsonConverter(){
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
List<MediaType> mediaTypeList = new ArrayList<>();
mediaTypeList.add(MediaType.TEXT_HTML);
mediaTypeList.add(MediaType.APPLICATION_JSON_UTF8);
converter.setSupportedMediaTypes(mediaTypeList);
ObjectMapper objectMapper = new ObjectMapper();
SimpleModule simpleModule = new SimpleModule();
simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
objectMapper.registerModule(simpleModule);
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
objectMapper.setTimeZone(TimeZone.getTimeZone("GMT+8"));
converter.setObjectMapper(objectMapper);
return converter;
}
@Override
public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
converters.add(responseStringConverter());
converters.add(responseJsonConverter());
}
@Override
public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
configurer.favorPathExtension(false);
}
@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**").allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
// .allowedMethods("*") // 允许提交请求的方法,*表示全部允许
.allowedOrigins("*") // #允许向该服务器提交请求的URI,*表示全部允许
.allowCredentials(true) // 允许cookies跨域
.allowedHeaders("*") // #允许访问的头信息,*表示全部
.maxAge(18000L); // 预检请求的缓存时间(秒),即在这个时间段里,对于相同的跨域请求不会再预检了
}
/**
* 配置静态资源
*/
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("swagger-ui.html")
.addResourceLocations("classpath:/META-INF/resources/");
registry.addResourceHandler("/webjars/**")
.addResourceLocations("classpath:/META-INF/resources/webjars/");
registry.addResourceHandler("/uploads/**")
.addResourceLocations("file:///home/ht/service/uploads/");
}
/**
* 配置拦截器
* @param registry
*/
@Override
public void addInterceptors(InterceptorRegistry registry) {
}
/**
* 配置数据源单数据源
*/
@Bean
public DataSource dataSource(){
return druidPropsUtil.createDruidDataSource();
}
@Bean
public Snowflake snowflake(){
return IdUtil.createSnowflake(Long.valueOf(workerId), Long.valueOf(datacenterId));
}
}

56
dh_ht/src/main/java/com/ccsens/dh_ht/config/SwaggerConfigure.java

@ -1,56 +0,0 @@
package com.ccsens.dh_ht.config;
import com.ccsens.util.WebConstant;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ParameterBuilder;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.schema.ModelRef;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Parameter;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.ArrayList;
import java.util.List;
@Configuration
@EnableSwagger2
@ConditionalOnExpression("${swagger.enable}")
//public class SwaggerConfigure extends WebMvcConfigurationSupport {
public class SwaggerConfigure /*implements WebMvcConfigurer*/ {
@Bean
public Docket customDocket() {
//
return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
.select()
.apis(RequestHandlerSelectors
.basePackage("com.ccsens.dh_ht.api"))
.build()
.globalOperationParameters(setHeaderToken());
}
private ApiInfo apiInfo() {
return new ApiInfo("Swagger Tall-game",//大标题 title
"This is a sample server Petstore server. You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/). For this sample, you can use the api key `special-key` to test the authorization filters.",//小标题
"1.0.0",//版本
"http://swagger.io/terms/",//termsOfServiceUrl
"zhangsan",//作者
"Apache 2.0",//链接显示文字
"http://www.apache.org/licenses/LICENSE-2.0.html"//网站链接
);
}
private List<Parameter> setHeaderToken() {
ParameterBuilder tokenPar = new ParameterBuilder();
List<Parameter> pars = new ArrayList<>();
tokenPar.name(WebConstant.HEADER_KEY_TOKEN).description("token")
.defaultValue(WebConstant.HEADER_KEY_TOKEN_PREFIX)
.modelRef(new ModelRef("string")).parameterType("header").required(false).build();
pars.add(tokenPar.build());
return pars;
}
}

25
dh_ht/src/main/java/com/ccsens/dh_ht/service/ProjectService.java

@ -1,25 +0,0 @@
package com.ccsens.dh_ht.service;
import com.ccsens.dh_ht.bean.dto.ProjectDto;
import com.ccsens.dh_ht.bean.vo.ProjectVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* @author
*/
@Slf4j
@Service
@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class ProjectService implements IProjectService {
@Override
public List<ProjectVo.DomainInfo> queryDomainByUser(ProjectDto.QueryProjectDto param, Long userId) {
return null;
}
}

12
dh_ht/src/main/java/com/ccsens/dh_ht/util/PtOsCodeError.java

@ -1,12 +0,0 @@
package com.ccsens.dh_ht.util;
import com.ccsens.util.CodeError;
/**
* @author
*/
public class PtOsCodeError extends CodeError {
public static final Code NOT_WBS_SHEET = new Code(501,"找不到wbs表",true);
}

50
dh_ht/src/main/java/com/ccsens/dh_ht/util/PtOsConstant.java

@ -1,50 +0,0 @@
package com.ccsens.dh_ht.util;
import java.util.HashMap;
import java.util.Map;
/**
* @author
*/
public class PtOsConstant {
/**图片类型*/
public static final String FILE_TYPE_IMG = "bmp,jpg,jpeg,png,tif,gif,pcx,tga,exif,fpx,svg,psd,cdr,pcd,dxf,ufo,eps,ai,raw,WMF,webp";
/**文档类型*/
public static final String FILE_TYPE_DOCUMENT = "doc, dot, wps, wpt, docx, dotx, docm, dotm, xls, xlt, et, xlsx, xltx, csv, xlsm, xltm, ppt,pptx,pptm,ppsx,ppsm,pps,potx,potm,dpt,dps, pdf";
/**验证手机正则*/
public static final String PHONE_REGEX = "^[1]([3-9])[0-9]{9}$";
/**字符串分隔符*/
public static final String STRING_REGEX = ",|,|;|;|、|/";
/**wbs相关*/
public static final class WbsExcel {
/**wbsSheet*/
public static final String WBS_SHEET = "WBS";
/**项目成员Sheet*/
public static final String MEMBER_SHEET = "项目成员表";
/**项目信息头*/
public static final String PROJECT_INFO_TITLE = "项目信息";
/**任务信息头*/
public static final String TASK_INFO_TITLE = "项目任务分解";
/**excel文件格式验证*/
public static final String WBS_FILE_FORMAT = "xls,xlsx";
/**插件配置表*/
public static final String WBS_PLUGIN_CONFIG = "插件配置表";
}
/**wbs表时长对应关系表*/
public static final Map<String, Long> WBS_DURATION = new HashMap<>();
static {
WBS_DURATION.put("s",1000L);
WBS_DURATION.put("min",60 * 1000L);
WBS_DURATION.put("h",60 * 60 * 1000L);
WBS_DURATION.put("d",24 * 60 * 60 * 1000L);
WBS_DURATION.put("w",7 * 24 * 60 * 60 * 1000L);
WBS_DURATION.put("m",30 * 24 * 60 * 60 * 1000L);
WBS_DURATION.put("y",365 * 24 * 60 * 60 * 1000L);
}
}

50
dh_ht/src/main/resources/application-dev.yml

@ -1,50 +0,0 @@
server:
port: 7310
servlet:
context-path:
spring:
application:
name: dh_ht
datasource:
type: com.alibaba.druid.pool.DruidDataSource
# rabbitmq:
# host: 192.168.0.99
# password: 111111
# port: 5672
# username: admin
rabbitmq:
host: 127.0.0.1
password: guest
port: 5672
username: guest
redis:
database: 0
host: 127.0.0.1
jedis:
pool:
max-active: 200
max-idle: 10
max-wait: -1ms
min-idle: 0
password: ''
port: 6379
timeout: 1000ms
swagger:
enable: true
mybatisCache:
database: 1
host: 127.0.0.1
jedis:
pool:
max-active: 200
max-idle: 10
max-wait: -1
min-idle: 0
password: ''
port: 6379
timeout: 1000
file:
path: /home/ht/service/uploads/
domain: https://test.tall.wiki/gateway/dh_ht
imgDomain: https://test.tall.wiki/gateway/dh_ht/uploads/

40
dh_ht/src/main/resources/application-prod.yml

@ -1,40 +0,0 @@
server:
port: 7310
servlet:
context-path:
spring:
application:
name: dh_ht
datasource:
type: com.alibaba.druid.pool.DruidDataSource
rabbitmq:
host: 121.36.3.207
password: 111111
port: 5672
username: admin
redis:
database: 0
host: 127.0.0.1
jedis:
pool:
max-active: 200
max-idle: 10
max-wait: -1ms
min-idle: 0
password: ''
# password: 'areowqr!@43ef'
port: 6379
timeout: 1000ms
swagger:
enable: true
eureka:
instance:
ip-address: 121.36.106.168
gatewayUrl: https://www.tall.wiki/gateway/
notGatewayUrl: https://www.tall.wiki/
apiUrl: https://www.tall.wiki/
file:
path: /home/ht/service/uploads/
domain: https://www.tall.wiki/gateway/dh_ht
imgDomain: https://www.tall.wiki/gateway/dh_ht/uploads/

48
dh_ht/src/main/resources/application-test.yml

@ -1,48 +0,0 @@
server:
port: 7310
servlet:
context-path:
spring:
application:
name: dh_ht
datasource:
type: com.alibaba.druid.pool.DruidDataSource
rabbitmq:
host: dd.tall.wiki
password: 111111
port: 5672
username: admin
redis:
database: 0
host: 127.0.0.1
jedis:
pool:
max-active: 200
max-idle: 10
max-wait: -1ms
min-idle: 0
password: ''
port: 6379
timeout: 1000ms
swagger:
enable: true
mybatisCache:
database: 1
host: 127.0.0.1
jedis:
pool:
max-active: 200
max-idle: 10
max-wait: -1
min-idle: 0
password: ''
port: 6379
timeout: 1000
eureka:
instance:
ip-address: 127.0.0.1
file:
path: /home/ht/service/uploads/
domain: https://test.tall.wiki/gateway/dh_ht
imgDomain: https://test.tall.wiki/gateway/dh_ht/uploads/

4
dh_ht/src/main/resources/application.yml

@ -1,4 +0,0 @@
spring:
profiles:
active: dev
include: common, util-dev

33
dh_ptos/.gitignore

@ -1,33 +0,0 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/
### VS Code ###
.vscode/

322
dh_ptos/mvnw

@ -1,322 +0,0 @@
#!/bin/sh
# ----------------------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# Maven Start Up Batch script
#
# Required ENV vars:
# ------------------
# JAVA_HOME - location of a JDK home dir
#
# Optional ENV vars
# -----------------
# M2_HOME - location of maven2's installed home dir
# MAVEN_OPTS - parameters passed to the Java VM when running Maven
# e.g. to debug Maven itself, use
# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
# ----------------------------------------------------------------------------
if [ -z "$MAVEN_SKIP_RC" ]; then
if [ -f /etc/mavenrc ]; then
. /etc/mavenrc
fi
if [ -f "$HOME/.mavenrc" ]; then
. "$HOME/.mavenrc"
fi
fi
# OS specific support. $var _must_ be set to either true or false.
cygwin=false
darwin=false
mingw=false
case "$(uname)" in
CYGWIN*) cygwin=true ;;
MINGW*) mingw=true ;;
Darwin*)
darwin=true
# Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
# See https://developer.apple.com/library/mac/qa/qa1170/_index.html
if [ -z "$JAVA_HOME" ]; then
if [ -x "/usr/libexec/java_home" ]; then
export JAVA_HOME="$(/usr/libexec/java_home)"
else
export JAVA_HOME="/Library/Java/Home"
fi
fi
;;
esac
if [ -z "$JAVA_HOME" ]; then
if [ -r /etc/gentoo-release ]; then
JAVA_HOME=$(java-config --jre-home)
fi
fi
if [ -z "$M2_HOME" ]; then
## resolve links - $0 may be a link to maven's home
PRG="$0"
# need this for relative symlinks
while [ -h "$PRG" ]; do
ls=$(ls -ld "$PRG")
link=$(expr "$ls" : '.*-> \(.*\)$')
if expr "$link" : '/.*' >/dev/null; then
PRG="$link"
else
PRG="$(dirname "$PRG")/$link"
fi
done
saveddir=$(pwd)
M2_HOME=$(dirname "$PRG")/..
# make it fully qualified
M2_HOME=$(cd "$M2_HOME" && pwd)
cd "$saveddir"
# echo Using m2 at $M2_HOME
fi
# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin; then
[ -n "$M2_HOME" ] &&
M2_HOME=$(cygpath --unix "$M2_HOME")
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
[ -n "$CLASSPATH" ] &&
CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
fi
# For Mingw, ensure paths are in UNIX format before anything is touched
if $mingw; then
[ -n "$M2_HOME" ] &&
M2_HOME="$( (
cd "$M2_HOME"
pwd
))"
[ -n "$JAVA_HOME" ] &&
JAVA_HOME="$( (
cd "$JAVA_HOME"
pwd
))"
fi
if [ -z "$JAVA_HOME" ]; then
javaExecutable="$(which javac)"
if [ -n "$javaExecutable" ] && ! [ "$(expr \"$javaExecutable\" : '\([^ ]*\)')" = "no" ]; then
# readlink(1) is not available as standard on Solaris 10.
readLink=$(which readlink)
if [ ! $(expr "$readLink" : '\([^ ]*\)') = "no" ]; then
if $darwin; then
javaHome="$(dirname \"$javaExecutable\")"
javaExecutable="$(cd \"$javaHome\" && pwd -P)/javac"
else
javaExecutable="$(readlink -f \"$javaExecutable\")"
fi
javaHome="$(dirname \"$javaExecutable\")"
javaHome=$(expr "$javaHome" : '\(.*\)/bin')
JAVA_HOME="$javaHome"
export JAVA_HOME
fi
fi
fi
if [ -z "$JAVACMD" ]; then
if [ -n "$JAVA_HOME" ]; then
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
else
JAVACMD="$(which java)"
fi
fi
if [ ! -x "$JAVACMD" ]; then
echo "Error: JAVA_HOME is not defined correctly." >&2
echo " We cannot execute $JAVACMD" >&2
exit 1
fi
if [ -z "$JAVA_HOME" ]; then
echo "Warning: JAVA_HOME environment variable is not set."
fi
CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
# traverses directory structure from process work directory to filesystem root
# first directory with .mvn subdirectory is considered project base directory
find_maven_basedir() {
if [ -z "$1" ]; then
echo "Path not specified to find_maven_basedir"
return 1
fi
basedir="$1"
wdir="$1"
while [ "$wdir" != '/' ]; do
if [ -d "$wdir"/.mvn ]; then
basedir=$wdir
break
fi
# workaround for JBEAP-8937 (on Solaris 10/Sparc)
if [ -d "${wdir}" ]; then
wdir=$(
cd "$wdir/.."
pwd
)
fi
# end of workaround
done
echo "${basedir}"
}
# concatenates all lines of a file
concat_lines() {
if [ -f "$1" ]; then
echo "$(tr -s '\n' ' ' <"$1")"
fi
}
BASE_DIR=$(find_maven_basedir "$(pwd)")
if [ -z "$BASE_DIR" ]; then
exit 1
fi
##########################################################################################
# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
# This allows using the maven wrapper in projects that prohibit checking in binary data.
##########################################################################################
if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
if [ "$MVNW_VERBOSE" = true ]; then
echo "Found .mvn/wrapper/maven-wrapper.jar"
fi
else
if [ "$MVNW_VERBOSE" = true ]; then
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
fi
if [ -n "$MVNW_REPOURL" ]; then
jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
else
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
fi
while IFS="=" read key value; do
case "$key" in wrapperUrl)
jarUrl="$value"
break
;;
esac
done <"$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
if [ "$MVNW_VERBOSE" = true ]; then
echo "Downloading from: $jarUrl"
fi
wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
if $cygwin; then
wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
fi
if command -v wget >/dev/null; then
if [ "$MVNW_VERBOSE" = true ]; then
echo "Found wget ... using wget"
fi
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
wget "$jarUrl" -O "$wrapperJarPath"
else
wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
fi
elif command -v curl >/dev/null; then
if [ "$MVNW_VERBOSE" = true ]; then
echo "Found curl ... using curl"
fi
if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
curl -o "$wrapperJarPath" "$jarUrl" -f
else
curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
fi
else
if [ "$MVNW_VERBOSE" = true ]; then
echo "Falling back to using Java to download"
fi
javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
# For Cygwin, switch paths to Windows format before running javac
if $cygwin; then
javaClass=$(cygpath --path --windows "$javaClass")
fi
if [ -e "$javaClass" ]; then
if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
if [ "$MVNW_VERBOSE" = true ]; then
echo " - Compiling MavenWrapperDownloader.java ..."
fi
# Compiling the Java class
("$JAVA_HOME/bin/javac" "$javaClass")
fi
if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
# Running the downloader
if [ "$MVNW_VERBOSE" = true ]; then
echo " - Running MavenWrapperDownloader.java ..."
fi
("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
fi
fi
fi
fi
##########################################################################################
# End of extension
##########################################################################################
export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
if [ "$MVNW_VERBOSE" = true ]; then
echo $MAVEN_PROJECTBASEDIR
fi
MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
[ -n "$M2_HOME" ] &&
M2_HOME=$(cygpath --path --windows "$M2_HOME")
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
[ -n "$CLASSPATH" ] &&
CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
[ -n "$MAVEN_PROJECTBASEDIR" ] &&
MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
fi
# Provide a "standardized" way to retrieve the CLI args that will
# work with both Windows and non-Windows executions.
MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
export MAVEN_CMD_LINE_ARGS
WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
exec "$JAVACMD" \
$MAVEN_OPTS \
-classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
"-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

182
dh_ptos/mvnw.cmd

@ -1,182 +0,0 @@
@REM ----------------------------------------------------------------------------
@REM Licensed to the Apache Software Foundation (ASF) under one
@REM or more contributor license agreements. See the NOTICE file
@REM distributed with this work for additional information
@REM regarding copyright ownership. The ASF licenses this file
@REM to you under the Apache License, Version 2.0 (the
@REM "License"); you may not use this file except in compliance
@REM with the License. You may obtain a copy of the License at
@REM
@REM https://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@REM KIND, either express or implied. See the License for the
@REM specific language governing permissions and limitations
@REM under the License.
@REM ----------------------------------------------------------------------------
@REM ----------------------------------------------------------------------------
@REM Maven Start Up Batch script
@REM
@REM Required ENV vars:
@REM JAVA_HOME - location of a JDK home dir
@REM
@REM Optional ENV vars
@REM M2_HOME - location of maven2's installed home dir
@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
@REM e.g. to debug Maven itself, use
@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
@REM ----------------------------------------------------------------------------
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
@echo off
@REM set title of command window
title %0
@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
@REM set %HOME% to equivalent of $HOME
if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
@REM Execute a user defined script before this one
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
:skipRcPre
@setlocal
set ERROR_CODE=0
@REM To isolate internal variables from possible post scripts, we use another setlocal
@setlocal
@REM ==== START VALIDATION ====
if not "%JAVA_HOME%" == "" goto OkJHome
echo.
echo Error: JAVA_HOME not found in your environment. >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
echo.
goto error
:OkJHome
if exist "%JAVA_HOME%\bin\java.exe" goto init
echo.
echo Error: JAVA_HOME is set to an invalid directory. >&2
echo JAVA_HOME = "%JAVA_HOME%" >&2
echo Please set the JAVA_HOME variable in your environment to match the >&2
echo location of your Java installation. >&2
echo.
goto error
@REM ==== END VALIDATION ====
:init
@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
@REM Fallback to current working directory if not found.
set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
set EXEC_DIR=%CD%
set WDIR=%EXEC_DIR%
:findBaseDir
IF EXIST "%WDIR%"\.mvn goto baseDirFound
cd ..
IF "%WDIR%"=="%CD%" goto baseDirNotFound
set WDIR=%CD%
goto findBaseDir
:baseDirFound
set MAVEN_PROJECTBASEDIR=%WDIR%
cd "%EXEC_DIR%"
goto endDetectBaseDir
:baseDirNotFound
set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
cd "%EXEC_DIR%"
:endDetectBaseDir
IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
@setlocal EnableExtensions EnableDelayedExpansion
for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
:endReadAdditionalConfig
SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
)
@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
if exist %WRAPPER_JAR% (
if "%MVNW_VERBOSE%" == "true" (
echo Found %WRAPPER_JAR%
)
) else (
if not "%MVNW_REPOURL%" == "" (
SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
)
if "%MVNW_VERBOSE%" == "true" (
echo Couldn't find %WRAPPER_JAR%, downloading it ...
echo Downloading from: %DOWNLOAD_URL%
)
powershell -Command "&{"^
"$webclient = new-object System.Net.WebClient;"^
"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
"}"^
"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
"}"
if "%MVNW_VERBOSE%" == "true" (
echo Finished downloading %WRAPPER_JAR%
)
)
@REM End of extension
@REM Provide a "standardized" way to retrieve the CLI args that will
@REM work with both Windows and non-Windows executions.
set MAVEN_CMD_LINE_ARGS=%*
%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
if ERRORLEVEL 1 goto error
goto end
:error
set ERROR_CODE=1
:end
@endlocal & set ERROR_CODE=%ERROR_CODE%
if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
@REM check for post script, once with legacy .bat ending and once with .cmd ending
if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
:skipRcPost
@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
if "%MAVEN_BATCH_PAUSE%" == "on" pause
if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
exit /B %ERROR_CODE%

31
dh_ptos/src/main/java/com/ccsens/dh_ptos/DhPtosApplication.java

@ -1,31 +0,0 @@
package com.ccsens.dh_ptos;
import com.ccsens.cloudutil.ribbon.RibbonConfiguration;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
import org.springframework.scheduling.annotation.EnableAsync;
/**
* @author
*/
@MapperScan(basePackages = {"com.ccsens.dh_ptos.persist.*","com.ccsens.common.persist.*"})
@ServletComponentScan
@EnableAsync
//开启断路器功能
@EnableCircuitBreaker
@EnableFeignClients(basePackages = "com.ccsens.cloudutil.feign")
@SpringBootApplication
@ComponentScan(basePackages = "com.ccsens", excludeFilters = { @ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value = RibbonConfiguration.class)})
public class DhPtosApplication {
public static void main(String[] args) {
SpringApplication.run(DhPtosApplication.class, args);
}
}

32
dh_ptos/src/main/java/com/ccsens/dh_ptos/api/DebugController.java

@ -1,32 +0,0 @@
package com.ccsens.dh_ptos.api;
import com.ccsens.util.JsonResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
/**
* @author
*/
@Api(tags = "DEBUG" , description = "DebugController | ")
@RestController
@RequestMapping("/debug")
@Slf4j
public class DebugController {
@ApiOperation(value = "/测试",notes = "")
@ApiImplicitParams({
})
@RequestMapping(value="",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
public JsonResponse debug(HttpServletRequest request) throws Exception {
return JsonResponse.newInstance().ok("测试");
}
}

41
dh_ptos/src/main/java/com/ccsens/dh_ptos/api/ProjectController.java

@ -1,41 +0,0 @@
package com.ccsens.dh_ptos.api;
import com.ccsens.dh_ptos.bean.dto.ProjectDto;
import com.ccsens.dh_ptos.bean.vo.ProjectVo;
import com.ccsens.dh_ptos.service.IProjectService;
import com.ccsens.util.JsonResponse;
import com.ccsens.util.bean.dto.QueryDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* @author
*/
@Api(tags = "project" , description = "项目相关接口")
@RestController
@RequestMapping("/project")
@Slf4j
public class ProjectController {
@Resource
private IProjectService projectService;
@ApiOperation(value = "查询用户所有域下所有业务内的所有项目", notes = "")
@RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<ProjectVo.DomainInfo>> queryDomainByUser(@ApiParam @Validated @RequestBody QueryDto<ProjectDto.QueryProjectDto> params) throws Exception{
log.info("查询用户所有域下所有业务内的所有项目:{}",params);
List<ProjectVo.DomainInfo> domainInfoList = projectService.queryDomainByUser(params.getParam(),params.getUserId());
log.info("查询用户所有域下所有业务内的所有项目");
return JsonResponse.newInstance().ok(domainInfoList);
}
}

18
dh_ptos/src/main/java/com/ccsens/dh_ptos/api/UserController.java

@ -1,18 +0,0 @@
package com.ccsens.dh_ptos.api;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author
*/
@Api(tags = "user" , description = "用户信息相关接口")
@RestController
@RequestMapping("/user")
@Slf4j
public class UserController {
}

22
dh_ptos/src/main/java/com/ccsens/dh_ptos/bean/dto/ProjectDto.java

@ -1,22 +0,0 @@
package com.ccsens.dh_ptos.bean.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author
*/
@Data
public class ProjectDto {
@Data
@ApiModel("用户查询可见的项目")
public static class QueryProjectDto{
@ApiModelProperty("开始时间")
private Long startTime;
@ApiModelProperty("结束时间")
private Long endTime;
}
}

86
dh_ptos/src/main/java/com/ccsens/dh_ptos/bean/vo/ProjectVo.java

@ -1,86 +0,0 @@
package com.ccsens.dh_ptos.bean.vo;
import cn.hutool.core.util.ObjectUtil;
import com.ccsens.util.WebConstant;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author
*/
@Data
public class ProjectVo {
@Data
@ApiModel("域信息")
public static class DomainInfo{
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("域名")
private String name;
@ApiModelProperty("域code")
private String code;
@ApiModelProperty("域访问前缀")
private String url;
@ApiModelProperty("是否是自身 0否 1是")
private byte self;
@ApiModelProperty("业务列表")
private List<BusinessInfo> businessList;
}
@Data
@ApiModel("业务信息")
public static class BusinessInfo{
@ApiModelProperty("业务id")
private Long businessId;
@ApiModelProperty("业务名")
private String businessName;
@ApiModelProperty("业务code")
private String businessCode;
@ApiModelProperty("业务访问前缀")
private String url;
@ApiModelProperty("项目列表")
private List<ProjectInfo> projectList;
}
@Data
@ApiModel("日历下项目列表信息")
public static class ProjectInfo{
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("项目名")
private String name;
@ApiModelProperty("开始时间")
private Long startTime;
@ApiModelProperty("结束时间")
private Long endTime;
@ApiModelProperty("项目完成状态(0-未开始,1-进行中,2-暂停,3-已完成)")
private byte status;
@ApiModelProperty("访问路径)")
private String url;
@ApiModelProperty("子项目")
private List<ProjectInfo> sonProjectList;
@JsonIgnore
@ApiModelProperty("父级id")
private Long parentId;
public Byte getStatus() {
long current = System.currentTimeMillis();
if(ObjectUtil.isNull(getStartTime()) || ObjectUtil.isNull(getEndTime())) {
return null;
}
if(getStartTime() > current){
this.status = (byte) WebConstant.EVENT_PROCESS.Pending.value;
}else if(getEndTime() < current){
this.status = (byte) WebConstant.EVENT_PROCESS.Expired.value;
}else{
this.status = (byte) WebConstant.EVENT_PROCESS.Processing.value;
}
return this.status;
}
}
}

159
dh_ptos/src/main/java/com/ccsens/dh_ptos/intercept/MybatisInterceptor.java

@ -1,159 +0,0 @@
package com.ccsens.dh_ptos.intercept;
import cn.hutool.core.collection.CollectionUtil;
import com.ccsens.util.WebConstant;
import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.mapping.BoundSql;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.mapping.ResultMap;
import org.apache.ibatis.mapping.SqlSource;
import org.apache.ibatis.plugin.*;
import org.apache.ibatis.reflection.DefaultReflectorFactory;
import org.apache.ibatis.reflection.MetaObject;
import org.apache.ibatis.reflection.factory.DefaultObjectFactory;
import org.apache.ibatis.reflection.wrapper.DefaultObjectWrapperFactory;
import org.apache.ibatis.session.ResultHandler;
import org.apache.ibatis.session.RowBounds;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Map;
import java.util.Properties;
/**
* @description:
* @author: wuHuiJuan
* @create: 2019/12/11 10:58
*/
@Intercepts({
@Signature(
type = Executor.class,
method = "query",
args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class}
)
})
public class MybatisInterceptor implements Interceptor {
@Override
public Object intercept(Invocation invocation) throws Throwable {
String selectByExample = "selectByExample";
String countByExample = "countByExample";
String countByExample2 = "selectByExample_COUNT";
String selectByPrimaryKey = "selectByPrimaryKey";
Object[] args = invocation.getArgs();
MappedStatement statement = (MappedStatement) args[0];
if (statement.getId().endsWith(selectByExample)
|| statement.getId().endsWith(countByExample)
|| statement.getId().endsWith(countByExample2)) {
//XXXExample
Object example = args[1];
addCondition(statement, example);
} else if (statement.getId().endsWith(selectByPrimaryKey)) {
BoundSql boundSql = statement.getBoundSql(args[1]);
String sql = boundSql.getSql() + " and rec_status = 0";
MappedStatement newStatement = newMappedStatement(statement, new BoundSqlSqlSource(boundSql));
MetaObject msObject = MetaObject.forObject(newStatement, new DefaultObjectFactory(), new DefaultObjectWrapperFactory(),new DefaultReflectorFactory());
msObject.setValue("sqlSource.boundSql.sql", sql);
args[0] = newStatement;
}
return invocation.proceed();
}
private void addCondition(MappedStatement statement, Object example) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException, ClassNotFoundException {
if (example instanceof Map) {
example = ((Map) example).get("_ORIGINAL_PARAMETER_OBJECT");
}
Method method = example.getClass().getMethod("getOredCriteria", null);
//获取到条件数组,第一个是Criteria
List list = (List) method.invoke(example);
if (CollectionUtil.isEmpty(list)) {
Class clazz = ((ResultMap) statement.getResultMaps().get(0)).getType();
String exampleName = clazz.getName() + "Example";
Object paramExample = Class.forName(exampleName).newInstance();
Method createCriteria = paramExample.getClass().getMethod("createCriteria");
Object criteria = createCriteria.invoke(paramExample);
Method andIsDelEqualTo = criteria.getClass().getMethod("andRecStatusEqualTo", Byte.class);
andIsDelEqualTo.invoke(criteria, WebConstant.REC_STATUS.Normal.value);
list.add(criteria);
} else {
Object criteria = list.get(0);
Method getCriteria = criteria.getClass().getMethod("getCriteria");
List params = (List) getCriteria.invoke(criteria);
boolean hasDel = false;
for (Object param : params) {
Method getCondition = param.getClass().getMethod("getCondition");
Object condition = getCondition.invoke(param);
if ("rec_status =".equals(condition)) {
hasDel = true;
}
}
if (!hasDel) {
Method andIsDelEqualTo = criteria.getClass().getMethod("andRecStatusEqualTo", Byte.class);
andIsDelEqualTo.invoke(criteria, WebConstant.REC_STATUS.Normal.value);
}
}
}
@Override
public Object plugin(Object target) {
return Plugin.wrap(target, this);
}
@Override
public void setProperties(Properties properties) {
}
private MappedStatement newMappedStatement(MappedStatement ms, SqlSource newSqlSource) {
MappedStatement.Builder builder =
new MappedStatement.Builder(ms.getConfiguration(), ms.getId(), newSqlSource, ms.getSqlCommandType());
builder.resource(ms.getResource());
builder.fetchSize(ms.getFetchSize());
builder.statementType(ms.getStatementType());
builder.keyGenerator(ms.getKeyGenerator());
if (ms.getKeyProperties() != null && ms.getKeyProperties().length != 0) {
StringBuilder keyProperties = new StringBuilder();
for (String keyProperty : ms.getKeyProperties()) {
keyProperties.append(keyProperty).append(",");
}
keyProperties.delete(keyProperties.length() - 1, keyProperties.length());
builder.keyProperty(keyProperties.toString());
}
builder.timeout(ms.getTimeout());
builder.parameterMap(ms.getParameterMap());
builder.resultMaps(ms.getResultMaps());
builder.resultSetType(ms.getResultSetType());
builder.cache(ms.getCache());
builder.flushCacheRequired(ms.isFlushCacheRequired());
builder.useCache(ms.isUseCache());
return builder.build();
}
// 定义一个内部辅助类,作用是包装sq
class BoundSqlSqlSource implements SqlSource {
private BoundSql boundSql;
public BoundSqlSqlSource(BoundSql boundSql) {
this.boundSql = boundSql;
}
@Override
public BoundSql getBoundSql(Object parameterObject) {
return boundSql;
}
}
}

19
dh_ptos/src/main/java/com/ccsens/dh_ptos/service/IProjectService.java

@ -1,19 +0,0 @@
package com.ccsens.dh_ptos.service;
import com.ccsens.dh_ptos.bean.dto.ProjectDto;
import com.ccsens.dh_ptos.bean.vo.ProjectVo;
import java.util.List;
/**
* @author
*/
public interface IProjectService {
/**
* 查询用户在所有域所有业务下的所有项目
* @param param 开始结束时间
* @param userId userId
* @return 返回项目列表
*/
List<ProjectVo.DomainInfo> queryDomainByUser(ProjectDto.QueryProjectDto param, Long userId);
}

25
dh_ptos/src/main/java/com/ccsens/dh_ptos/service/ProjectService.java

@ -1,25 +0,0 @@
package com.ccsens.dh_ptos.service;
import com.ccsens.dh_ptos.bean.dto.ProjectDto;
import com.ccsens.dh_ptos.bean.vo.ProjectVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* @author
*/
@Slf4j
@Service
@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
public class ProjectService implements IProjectService {
@Override
public List<ProjectVo.DomainInfo> queryDomainByUser(ProjectDto.QueryProjectDto param, Long userId) {
return null;
}
}

30
dh_ptos/src/main/resources/application-common.yml

@ -1,30 +0,0 @@
logging:
level:
com:
favorites: DEBUG
org:
hibernate: ERROR
springframework:
web: DEBUG
mybatis:
config-location: classpath:mybatis/mybatis-config.xml
mapper-locations: classpath*:mapper_*/*.xml
# type-aliases-package: com.ccsens.mtpro.bean
#server:
# tomcat:
# uri-encoding: UTF-8
spring:
http:
encoding:
charset: UTF-8
enabled: true
force: true
log-request-details: true
servlet:
multipart:
max-file-size: 10MB
max-request-size: 100MB
snowflake:
datacenterId: 10
workerId: 1

4
dh_ptos/src/main/resources/application.yml

@ -1,4 +0,0 @@
spring:
profiles:
active: dev
include: common, util-dev

34
dh_ptos/src/main/resources/druid-dev.yml

@ -1,34 +0,0 @@
spring:
datasource:
druid:
connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
driverClassName: com.mysql.cj.jdbc.Driver
dynamicUrl: jdbc:mysql://localhost:3306/${schema}
filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
filterName: druidFilter
filterProfileEnable: true
filterUrlPattern: /*
filters: stat,wall
initialSize: 5
maxActive: 20
maxPoolPreparedStatementPerConnectionSize: 20
maxWait: 60000
minEvictableIdleTimeMillis: 300000
minIdle: 5
# password: 37080c1f223685592316b02dad8816c019290a476e54ebb638f9aa3ba8b6bdb9
password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
poolPreparedStatements: true
servletLogSlowSql: true
servletLoginPassword: 111111
servletLoginUsername: druid
servletName: druidServlet
servletResetEnable: true
servletUrlMapping: /druid/*
testOnBorrow: false
testOnReturn: false
testWhileIdle: true
timeBetweenEvictionRunsMillis: 60000
url: jdbc:mysql://101.201.226.163:3306/dh_ht?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
username: root
validationQuery: SELECT 1 FROM DUAL
env: CCSENS_TALL

35
dh_ptos/src/main/resources/druid-prod.yml

@ -1,35 +0,0 @@
spring:
datasource:
druid:
connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
driverClassName: com.mysql.cj.jdbc.Driver
dynamicUrl: jdbc:mysql://localhost:3306/${schema}
filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
filterName: druidFilter
filterProfileEnable: true
filterUrlPattern: /*
filters: stat,wall
initialSize: 5
maxActive: 20
maxPoolPreparedStatementPerConnectionSize: 20
maxWait: 60000
minEvictableIdleTimeMillis: 300000
minIdle: 5
# password:
password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
poolPreparedStatements: true
servletLogSlowSql: true
servletLoginPassword: 111111
servletLoginUsername: druid
servletName: druidServlet
servletResetEnable: true
servletUrlMapping: /druid/*
testOnBorrow: false
testOnReturn: false
testWhileIdle: true
timeBetweenEvictionRunsMillis: 60000
# url: jdbc:mysql://127.0.0.1/defaultwbs?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
url: jdbc:mysql://www.tall.wiki/data_centre?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
username: root
validationQuery: SELECT 1 FROM DUAL
env: CCSENS_TALL

34
dh_ptos/src/main/resources/druid-test.yml

@ -1,34 +0,0 @@
spring:
datasource:
druid:
connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
driverClassName: com.mysql.cj.jdbc.Driver
dynamicUrl: jdbc:mysql://localhost:3306/${schema}
filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
filterName: druidFilter
filterProfileEnable: true
filterUrlPattern: /*
filters: stat,wall
initialSize: 5
maxActive: 20
maxPoolPreparedStatementPerConnectionSize: 20
maxWait: 60000
minEvictableIdleTimeMillis: 300000
minIdle: 5
# password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
password:
poolPreparedStatements: true
servletLogSlowSql: true
servletLoginPassword: 111111
servletLoginUsername: druid
servletName: druidServlet
servletResetEnable: true
servletUrlMapping: /druid/*
testOnBorrow: false
testOnReturn: false
testWhileIdle: true
timeBetweenEvictionRunsMillis: 60000
url: jdbc:mysql://101.201.226.163:3306/tall_dm?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
username: root
validationQuery: SELECT 1 FROM DUAL
env: CCSENS_TALL

62
dh_ptos/src/main/resources/mybatis/mybatis-config.xml

@ -1,62 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-config.dtd">
<configuration>
<!-- 全局参数 -->
<settings>
<!-- 打印SQL语句 -->
<setting name="logImpl" value="STDOUT_LOGGING" />
<!-- 使全局的映射器启用或禁用缓存。 -->
<setting name="cacheEnabled" value="true"/>
<!-- 全局启用或禁用延迟加载。当禁用时,所有关联对象都会即时加载。 -->
<setting name="lazyLoadingEnabled" value="true"/>
<!-- 当启用时,有延迟加载属性的对象在被调用时将会完全加载任意属性。否则,每种属性将会按需要加载。 -->
<setting name="aggressiveLazyLoading" value="true"/>
<!-- 是否允许单条sql 返回多个数据集 (取决于驱动的兼容性) default:true -->
<setting name="multipleResultSetsEnabled" value="true"/>
<!-- 是否可以使用列的别名 (取决于驱动的兼容性) default:true -->
<setting name="useColumnLabel" value="true"/>
<!-- 允许JDBC 生成主键。需要驱动器支持。如果设为了true,这个设置将强制使用被生成的主键,有一些驱动器不兼容不过仍然可以执行。 default:false -->
<setting name="useGeneratedKeys" value="true"/>
<!-- 指定 MyBatis 如何自动映射 数据基表的列 NONE:不隐射 PARTIAL:部分 FULL:全部 -->
<setting name="autoMappingBehavior" value="PARTIAL"/>
<!-- 这是默认的执行类型 (SIMPLE: 简单; REUSE: 执行器可能重复使用prepared statements语句;BATCH: 执行器可以重复执行语句和批量更新) -->
<setting name="defaultExecutorType" value="SIMPLE"/>
<!-- 使用驼峰命名法转换字段。 -->
<setting name="mapUnderscoreToCamelCase" value="true"/>
<!-- 设置本地缓存范围 session:就会有数据的共享 statement:语句范围 (这样就不会有数据的共享 ) defalut:session -->
<setting name="localCacheScope" value="SESSION"/>
<!-- 设置但JDBC类型为空时,某些驱动程序 要指定值,default:OTHER,插入空值时不需要指定类型 -->
<setting name="jdbcTypeForNull" value="NULL"/>
</settings>
<typeAliases>
<typeAlias alias="Integer" type="java.lang.Integer" />
<typeAlias alias="Long" type="java.lang.Long" />
<typeAlias alias="HashMap" type="java.util.HashMap" />
<typeAlias alias="LinkedHashMap" type="java.util.LinkedHashMap" />
<typeAlias alias="ArrayList" type="java.util.ArrayList" />
<typeAlias alias="LinkedList" type="java.util.LinkedList" />
<typeAlias alias="String" type="java.lang.String" />
</typeAliases>
<plugins>
<!-- com.github.pagehelper为PageHelper类所在包名 -->
<plugin interceptor="com.github.pagehelper.PageHelper">
<property name="dialect" value="mysql"/>
<!-- 该参数默认为false -->
<!-- 设置为true时,会将RowBounds第一个参数offset当成pageNum页码使用 -->
<!-- 和startPage中的pageNum效果一样-->
<property name="offsetAsPageNum" value="false"/>
<!-- 该参数默认为false -->
<!-- 设置为true时,使用RowBounds分页会进行count查询 -->
<property name="rowBoundsWithCount" value="false"/>
<property name="pageSizeZero" value="true"/>
<property name="reasonable" value="false"/>
<property name="supportMethodsArguments" value="false"/>
<property name="returnPageInfo" value="none"/>
</plugin>
</plugins>
</configuration>

8
pom.xml

@ -9,14 +9,14 @@
<module>cloudutil</module>
<module>util</module>
<module>wechatutil</module>
<module>dh_ptos</module>
<module>dh_diplomatist</module>
<module>dh_ht</module>
<module>ptos_tall</module>
<module>ptos_diplomatist</module>
<!-- <module>dh_ht</module>-->
</modules>
<groupId>com.ccsens</groupId>
<artifactId>ccsens_dh</artifactId>
<artifactId>ccsens_ptos</artifactId>
<version>1.0-SNAPSHOT</version>

0
dh_diplomatist/.gitignore → ptos_diplomatist/.gitignore

0
dh_diplomatist/mvnw → ptos_diplomatist/mvnw

0
dh_diplomatist/mvnw.cmd → ptos_diplomatist/mvnw.cmd

8
dh_diplomatist/pom.xml → ptos_diplomatist/pom.xml

@ -3,16 +3,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>ccsens_dh</artifactId>
<artifactId>ccsens_ptos</artifactId>
<groupId>com.ccsens</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>dh_diplomatist</artifactId>
<artifactId>ptos_diplomatist</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>dh_diplomatist</name>
<name>ptos_diplomatist</name>
<description>Demo project for Spring Boot</description>
<properties>
@ -71,7 +71,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>com.ccsens.dh_diplomatist.DhDiplomatistApplication</mainClass>
<mainClass>com.ccsens.ptos_diplomatist.PotsDiplomatistApplication</mainClass>
<!--<skip>true</skip>-->
</configuration>
<executions>

10
dh_ht/src/main/java/com/ccsens/dh_ht/DhHtApplication.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/PotsDiplomatistApplication.java

@ -1,4 +1,4 @@
package com.ccsens.dh_ht;
package com.ccsens.ptos_diplomatist;
import com.ccsens.cloudutil.ribbon.RibbonConfiguration;
import org.mybatis.spring.annotation.MapperScan;
@ -10,22 +10,24 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
* @author
*/
@MapperScan(basePackages = {"com.ccsens.dh_ht.persist.*","com.ccsens.common.persist.*"})
@MapperScan(basePackages = {"com.ccsens.ptos_diplomatist.persist.*","com.ccsens.common.persist.*"})
@ServletComponentScan
@EnableAsync
@EnableScheduling
//开启断路器功能
@EnableCircuitBreaker
@EnableFeignClients(basePackages = "com.ccsens.cloudutil.feign")
@SpringBootApplication
@ComponentScan(basePackages = "com.ccsens", excludeFilters = { @ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value = RibbonConfiguration.class)})
public class DhHtApplication {
public class PotsDiplomatistApplication {
public static void main(String[] args) {
SpringApplication.run(DhHtApplication.class, args);
SpringApplication.run(PotsDiplomatistApplication.class, args);
}
}

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/DebugController.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/DebugController.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.api;
package com.ccsens.ptos_diplomatist.api;
import com.ccsens.util.JsonResponse;
import io.swagger.annotations.Api;

10
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/DomainController.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/DomainController.java

@ -1,10 +1,10 @@
package com.ccsens.dh_diplomatist.api;
package com.ccsens.ptos_diplomatist.api;
import cn.hutool.extra.servlet.ServletUtil;
import com.ccsens.dh_diplomatist.bean.dto.HeartbeatDto;
import com.ccsens.dh_diplomatist.bean.dto.UserDto;
import com.ccsens.dh_diplomatist.bean.vo.DomainVo;
import com.ccsens.dh_diplomatist.service.IDomainService;
import com.ccsens.ptos_diplomatist.bean.dto.HeartbeatDto;
import com.ccsens.ptos_diplomatist.bean.dto.UserDto;
import com.ccsens.ptos_diplomatist.bean.vo.DomainVo;
import com.ccsens.ptos_diplomatist.service.IDomainService;
import com.ccsens.util.JsonResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

15
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/HeartbeatController.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/HeartbeatController.java

@ -1,8 +1,8 @@
package com.ccsens.dh_diplomatist.api;
package com.ccsens.ptos_diplomatist.api;
import cn.hutool.extra.servlet.ServletUtil;
import com.ccsens.dh_diplomatist.bean.dto.HeartbeatDto;
import com.ccsens.dh_diplomatist.service.IHeartbeatService;
import com.ccsens.ptos_diplomatist.bean.dto.HeartbeatDto;
import com.ccsens.ptos_diplomatist.service.IHeartbeatService;
import com.ccsens.util.JsonResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletRequest;
*/
@Api(tags = "heartbeat" , description = "域信息相关接口")
@RestController
@RequestMapping("/heartbeat")
@RequestMapping("/heart")
@Slf4j
public class HeartbeatController {
@Resource
@ -34,5 +34,12 @@ public class HeartbeatController {
return JsonResponse.newInstance().ok();
}
@ApiOperation(value = "接收私域的心跳", notes = "")
@RequestMapping(value = "tall", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse receiveHeartbeat() throws Exception{
log.info("接受PTOS_TALL心跳后正确返回");
return JsonResponse.newInstance().ok();
}
}

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/UserController.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/UserController.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.api;
package com.ccsens.ptos_diplomatist.api;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/dto/HeartbeatDto.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/dto/HeartbeatDto.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.bean.dto;
package com.ccsens.ptos_diplomatist.bean.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/dto/UserDto.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/dto/UserDto.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.bean.dto;
package com.ccsens.ptos_diplomatist.bean.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcBusiness.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcBusiness.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.bean.po;
package com.ccsens.ptos_diplomatist.bean.po;
import java.io.Serializable;
import java.util.Date;

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcBusinessExample.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcBusinessExample.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.bean.po;
package com.ccsens.ptos_diplomatist.bean.po;
import java.util.ArrayList;
import java.util.Date;

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomain.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomain.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.bean.po;
package com.ccsens.ptos_diplomatist.bean.po;
import java.io.Serializable;
import java.util.Date;

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomainBusiness.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomainBusiness.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.bean.po;
package com.ccsens.ptos_diplomatist.bean.po;
import java.io.Serializable;
import java.util.Date;

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomainBusinessExample.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomainBusinessExample.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.bean.po;
package com.ccsens.ptos_diplomatist.bean.po;
import java.util.ArrayList;
import java.util.Date;

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomainExample.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomainExample.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.bean.po;
package com.ccsens.ptos_diplomatist.bean.po;
import java.util.ArrayList;
import java.util.Date;

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUser.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUser.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.bean.po;
package com.ccsens.ptos_diplomatist.bean.po;
import java.io.Serializable;
import java.util.Date;

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUserDomain.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUserDomain.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.bean.po;
package com.ccsens.ptos_diplomatist.bean.po;
import java.io.Serializable;
import java.util.Date;

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUserDomainExample.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUserDomainExample.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.bean.po;
package com.ccsens.ptos_diplomatist.bean.po;
import java.util.ArrayList;
import java.util.Date;

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUserExample.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUserExample.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.bean.po;
package com.ccsens.ptos_diplomatist.bean.po;
import java.util.ArrayList;
import java.util.Date;

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/vo/DomainVo.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/vo/DomainVo.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.bean.vo;
package com.ccsens.ptos_diplomatist.bean.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

4
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/config/BeanConfig.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/config/BeanConfig.java

@ -1,6 +1,6 @@
package com.ccsens.dh_diplomatist.config;
package com.ccsens.ptos_diplomatist.config;
import com.ccsens.dh_diplomatist.intercept.MybatisInterceptor;
import com.ccsens.ptos_diplomatist.intercept.MybatisInterceptor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

4
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/config/SpringConfig.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/config/SpringConfig.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.config;
package com.ccsens.ptos_diplomatist.config;
import cn.hutool.core.lang.Snowflake;
@ -100,7 +100,7 @@ public class SpringConfig implements WebMvcConfigurer {
.addResourceLocations("classpath:/META-INF/resources/webjars/");
registry.addResourceHandler("/uploads/**")
.addResourceLocations("file:///home/diplomatist/service/uploads/");
.addResourceLocations("file:///home/ptos_diplomatist/server/uploads/");
}
/**

4
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/config/SwaggerConfigure.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/config/SwaggerConfigure.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.config;
package com.ccsens.ptos_diplomatist.config;
import com.ccsens.util.WebConstant;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
@ -28,7 +28,7 @@ public class SwaggerConfigure /*implements WebMvcConfigurer*/ {
.apiInfo(apiInfo())
.select()
.apis(RequestHandlerSelectors
.basePackage("com.ccsens.dh_diplomatist.api"))
.basePackage("com.ccsens.ptos_diplomatist.api"))
.build()
.globalOperationParameters(setHeaderToken());
}

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/intercept/MybatisInterceptor.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/intercept/MybatisInterceptor.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.intercept;
package com.ccsens.ptos_diplomatist.intercept;
import cn.hutool.core.collection.CollectionUtil;
import com.ccsens.util.WebConstant;

8
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/dao/IdcDomainDao.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/dao/IdcDomainDao.java

@ -1,8 +1,8 @@
package com.ccsens.dh_diplomatist.persist.dao;
package com.ccsens.ptos_diplomatist.persist.dao;
import com.ccsens.dh_diplomatist.bean.po.IdcDomain;
import com.ccsens.dh_diplomatist.bean.vo.DomainVo;
import com.ccsens.dh_diplomatist.persist.mapper.IdcDomainMapper;
import com.ccsens.ptos_diplomatist.bean.po.IdcDomain;
import com.ccsens.ptos_diplomatist.bean.vo.DomainVo;
import com.ccsens.ptos_diplomatist.persist.mapper.IdcDomainMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;

6
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcBusinessMapper.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcBusinessMapper.java

@ -1,7 +1,7 @@
package com.ccsens.dh_diplomatist.persist.mapper;
package com.ccsens.ptos_diplomatist.persist.mapper;
import com.ccsens.dh_diplomatist.bean.po.IdcBusiness;
import com.ccsens.dh_diplomatist.bean.po.IdcBusinessExample;
import com.ccsens.ptos_diplomatist.bean.po.IdcBusiness;
import com.ccsens.ptos_diplomatist.bean.po.IdcBusinessExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;

6
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcDomainBusinessMapper.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcDomainBusinessMapper.java

@ -1,7 +1,7 @@
package com.ccsens.dh_diplomatist.persist.mapper;
package com.ccsens.ptos_diplomatist.persist.mapper;
import com.ccsens.dh_diplomatist.bean.po.IdcDomainBusiness;
import com.ccsens.dh_diplomatist.bean.po.IdcDomainBusinessExample;
import com.ccsens.ptos_diplomatist.bean.po.IdcDomainBusiness;
import com.ccsens.ptos_diplomatist.bean.po.IdcDomainBusinessExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;

6
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcDomainMapper.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcDomainMapper.java

@ -1,7 +1,7 @@
package com.ccsens.dh_diplomatist.persist.mapper;
package com.ccsens.ptos_diplomatist.persist.mapper;
import com.ccsens.dh_diplomatist.bean.po.IdcDomain;
import com.ccsens.dh_diplomatist.bean.po.IdcDomainExample;
import com.ccsens.ptos_diplomatist.bean.po.IdcDomain;
import com.ccsens.ptos_diplomatist.bean.po.IdcDomainExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;

6
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcUserDomainMapper.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcUserDomainMapper.java

@ -1,7 +1,7 @@
package com.ccsens.dh_diplomatist.persist.mapper;
package com.ccsens.ptos_diplomatist.persist.mapper;
import com.ccsens.dh_diplomatist.bean.po.IdcUserDomain;
import com.ccsens.dh_diplomatist.bean.po.IdcUserDomainExample;
import com.ccsens.ptos_diplomatist.bean.po.IdcUserDomain;
import com.ccsens.ptos_diplomatist.bean.po.IdcUserDomainExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;

6
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcUserMapper.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcUserMapper.java

@ -1,7 +1,7 @@
package com.ccsens.dh_diplomatist.persist.mapper;
package com.ccsens.ptos_diplomatist.persist.mapper;
import com.ccsens.dh_diplomatist.bean.po.IdcUser;
import com.ccsens.dh_diplomatist.bean.po.IdcUserExample;
import com.ccsens.ptos_diplomatist.bean.po.IdcUser;
import com.ccsens.ptos_diplomatist.bean.po.IdcUserExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;

14
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/DomainService.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/DomainService.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.service;
package com.ccsens.ptos_diplomatist.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
@ -11,11 +11,11 @@ import cn.hutool.crypto.asymmetric.RSA;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ccsens.dh_diplomatist.bean.dto.HeartbeatDto;
import com.ccsens.dh_diplomatist.bean.po.IdcDomain;
import com.ccsens.dh_diplomatist.bean.vo.DomainVo;
import com.ccsens.dh_diplomatist.persist.dao.IdcDomainDao;
import com.ccsens.dh_diplomatist.util.DiplomatistCodeError;
import com.ccsens.ptos_diplomatist.bean.dto.HeartbeatDto;
import com.ccsens.ptos_diplomatist.bean.po.IdcDomain;
import com.ccsens.ptos_diplomatist.bean.vo.DomainVo;
import com.ccsens.ptos_diplomatist.persist.dao.IdcDomainDao;
import com.ccsens.ptos_diplomatist.util.DiplomatistCodeError;
import com.ccsens.util.RestTemplateUtil;
import com.ccsens.util.exception.BaseException;
import lombok.extern.slf4j.Slf4j;
@ -81,7 +81,7 @@ public class DomainService implements IDomainService {
//验证ip白名单是否匹配
if(domainInfo == null || !domainInfo.getHost().equals(clientIp)){
log.info("白名单不匹配:{}---实际请求{}",domainInfo,clientIp);
// throw new BaseException(dh_diplomatistCodeError.GET_DOMAIN_ERROR);
// throw new BaseException(ptos_diplomatistCodeError.GET_DOMAIN_ERROR);
}
//查询除了自身的所有域信息并返回
return domainDao.queryAllDomain();

15
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/HeartbeatService.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/HeartbeatService.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.service;
package com.ccsens.ptos_diplomatist.service;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.CharsetUtil;
@ -8,10 +8,10 @@ import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.ccsens.dh_diplomatist.bean.dto.HeartbeatDto;
import com.ccsens.dh_diplomatist.bean.po.IdcDomain;
import com.ccsens.dh_diplomatist.persist.dao.IdcDomainDao;
import com.ccsens.dh_diplomatist.util.DiplomatistCodeError;
import com.ccsens.ptos_diplomatist.bean.dto.HeartbeatDto;
import com.ccsens.ptos_diplomatist.bean.po.IdcDomain;
import com.ccsens.ptos_diplomatist.persist.dao.IdcDomainDao;
import com.ccsens.ptos_diplomatist.util.DiplomatistCodeError;
import com.ccsens.util.RestTemplateUtil;
import com.ccsens.util.exception.BaseException;
import lombok.extern.slf4j.Slf4j;
@ -76,7 +76,7 @@ public class HeartbeatService implements IHeartbeatService {
//验证ip白名单是否匹配
if(domainInfo == null || !domainInfo.getHost().equals(clientIp)){
log.info("白名单不匹配:{}---实际请求{}",domainInfo,clientIp);
// throw new BaseException(dh_diplomatistCodeError.HEARTBEAT_ERROR);
// throw new BaseException(ptos_diplomatistCodeError.HEARTBEAT_ERROR);
}
}
@ -116,10 +116,9 @@ public class HeartbeatService implements IHeartbeatService {
//TODO 随机码
sendDomain.setData(encrypt2);
//发送心跳
String url = idcDomain.getUrl() + "/heartbeat";
String url = idcDomain.getUrl() + "/heart";
log.info("调用接口:{}--{}", url, sendDomain);
String postBody = RestTemplateUtil.postBody(url, sendDomain);
System.out.println(postBody);
JSONObject jsonObject = JSONObject.parseObject(postBody);
log.info("接口返回:{}", jsonObject);
//请求正确返回则修改最后应答时间,否则无操作

6
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/IDomainService.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/IDomainService.java

@ -1,7 +1,7 @@
package com.ccsens.dh_diplomatist.service;
package com.ccsens.ptos_diplomatist.service;
import com.ccsens.dh_diplomatist.bean.dto.HeartbeatDto;
import com.ccsens.dh_diplomatist.bean.vo.DomainVo;
import com.ccsens.ptos_diplomatist.bean.dto.HeartbeatDto;
import com.ccsens.ptos_diplomatist.bean.vo.DomainVo;
import java.util.List;

4
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/IHeartbeatService.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/IHeartbeatService.java

@ -1,6 +1,6 @@
package com.ccsens.dh_diplomatist.service;
package com.ccsens.ptos_diplomatist.service;
import com.ccsens.dh_diplomatist.bean.dto.HeartbeatDto;
import com.ccsens.ptos_diplomatist.bean.dto.HeartbeatDto;
/**
* @author

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/util/DiplomatistCodeError.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/util/DiplomatistCodeError.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.util;
package com.ccsens.ptos_diplomatist.util;
import com.ccsens.util.CodeError;

2
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/util/DiplomatistConstant.java → ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/util/DiplomatistConstant.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist.util;
package com.ccsens.ptos_diplomatist.util;
import java.util.HashMap;
import java.util.Map;

0
dh_diplomatist/src/main/resources/application-common.yml → ptos_diplomatist/src/main/resources/application-common.yml

8
dh_diplomatist/src/main/resources/application-dev.yml → ptos_diplomatist/src/main/resources/application-dev.yml

@ -4,7 +4,7 @@ server:
context-path:
spring:
application:
name: dh_diplomatist
name: diplomatist
datasource:
type: com.alibaba.druid.pool.DruidDataSource
rabbitmq:
@ -46,6 +46,6 @@ mybatisCache:
file:
path: /home/diplomatist/service/uploads/
domain: https://test.tall.wiki/gateway/dh_diplomatist
imgDomain: https://test.tall.wiki/gateway/dh_diplomatist/uploads/
path: /home/ptos_diplomatist/server/uploads/
domain: https://test.tall.wiki/gateway/diplomatist
imgDomain: https://test.tall.wiki/gateway/diplomatist/uploads/

8
dh_diplomatist/src/main/resources/application-prod.yml → ptos_diplomatist/src/main/resources/application-prod.yml

@ -4,7 +4,7 @@ server:
context-path:
spring:
application:
name: dh_diplomatist
name: diplomatist
datasource:
type: com.alibaba.druid.pool.DruidDataSource
rabbitmq:
@ -35,6 +35,6 @@ gatewayUrl: https://www.tall.wiki/gateway/
notGatewayUrl: https://www.tall.wiki/
apiUrl: https://www.tall.wiki/
file:
path: /home/diplomatist/service/uploads/
domain: https://www.tall.wiki/gateway/dh_diplomatist
imgDomain: https://www.tall.wiki/gateway/dh_diplomatist/uploads/
path: /home/ptos_diplomatist/server/uploads/
domain: https://www.tall.wiki/gateway/diplomatist
imgDomain: https://www.tall.wiki/gateway/diplomatist/uploads/

8
dh_diplomatist/src/main/resources/application-test.yml → ptos_diplomatist/src/main/resources/application-test.yml

@ -4,7 +4,7 @@ server:
context-path:
spring:
application:
name: dh_diplomatist
name: diplomatist
datasource:
type: com.alibaba.druid.pool.DruidDataSource
# rabbitmq:
@ -43,6 +43,6 @@ eureka:
ip-address: 127.0.0.1
file:
path: /home/diplomatist/service/uploads/
domain: https://test.tall.wiki/gateway/dh_diplomatist
imgDomain: https://test.tall.wiki/gateway/dh_diplomatist/uploads/
path: /home/ptos_diplomatist/server/uploads/
domain: https://test.tall.wiki/gateway/diplomatist
imgDomain: https://test.tall.wiki/gateway/diplomatist/uploads/

4
ptos_diplomatist/src/main/resources/application.yml

@ -0,0 +1,4 @@
spring:
profiles:
active: prod
include: common, util-prod

2
dh_diplomatist/src/main/resources/druid-dev.yml → ptos_diplomatist/src/main/resources/druid-dev.yml

@ -28,7 +28,7 @@ spring:
testOnReturn: false
testWhileIdle: true
timeBetweenEvictionRunsMillis: 60000
url: jdbc:mysql://101.201.226.163:3306/tall_dh?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
url: jdbc:mysql://101.201.226.163:3306/tall_df?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
username: root
validationQuery: SELECT 1 FROM DUAL
env: CCSENS_TALL

0
dh_diplomatist/src/main/resources/druid-prod.yml → ptos_diplomatist/src/main/resources/druid-prod.yml

0
dh_diplomatist/src/main/resources/druid-test.yml → ptos_diplomatist/src/main/resources/druid-test.yml

2
dh_ht/src/main/resources/logback-spring.xml → ptos_diplomatist/src/main/resources/logback-spring.xml

@ -9,7 +9,7 @@
<contextName>logback</contextName>
<!-- name的值是变量的名称,value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后,可以使“${}”来使用变量。 -->
<property name="log.path" value="/home/ht/service/log/" />
<property name="log.path" value="/home/ptos_diplomatist/server/log/" />
<!-- 彩色日志 -->
<!-- 彩色日志依赖的渲染类 -->

12
dh_diplomatist/src/main/resources/mapper_dao/SPluginDao.xml → ptos_diplomatist/src/main/resources/mapper_dao/SPluginDao.xml

@ -1,15 +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.ccsens.dh_diplomatist.persist.dao.IdcDomainDao">
<mapper namespace="com.ccsens.ptos_diplomatist.persist.dao.IdcDomainDao">
<select id="getByCode" resultType="com.ccsens.dh_diplomatist.bean.po.IdcDomain">
<select id="getByCode" resultType="com.ccsens.ptos_diplomatist.bean.po.IdcDomain">
SELECT * FROM `t_idc_domain` WHERE `code` = #{code} and rec_status = 0 limit 1
</select>
<select id="getOneself" resultType="com.ccsens.dh_diplomatist.bean.po.IdcDomain">
<select id="getOneself" resultType="com.ccsens.ptos_diplomatist.bean.po.IdcDomain">
SELECT * FROM `t_idc_domain` WHERE self = 1 and rec_status = 0 limit 1
</select>
<select id="getPolling" resultType="com.ccsens.dh_diplomatist.bean.po.IdcDomain">
<select id="getPolling" resultType="com.ccsens.ptos_diplomatist.bean.po.IdcDomain">
SELECT
`id`,
`name`,
@ -27,7 +27,7 @@
and self = 0
and rec_status = 0
</select>
<select id="queryAllDomain" resultType="com.ccsens.dh_diplomatist.bean.vo.DomainVo$DomainInfo">
<select id="queryAllDomain" resultType="com.ccsens.ptos_diplomatist.bean.vo.DomainVo$DomainInfo">
SELECT
`id`,
`name`,
@ -41,7 +41,7 @@
WHERE
rec_status = 0
</select>
<select id="getPubDomain" resultType="com.ccsens.dh_diplomatist.bean.po.IdcDomain">
<select id="getPubDomain" resultType="com.ccsens.ptos_diplomatist.bean.po.IdcDomain">
SELECT * FROM `t_idc_domain` WHERE pub = 1 and rec_status = 0 limit 1
</select>
</mapper>

18
dh_diplomatist/src/main/resources/mapper_raw/IdcBusinessMapper.xml → ptos_diplomatist/src/main/resources/mapper_raw/IdcBusinessMapper.xml

@ -1,7 +1,7 @@
<?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.ccsens.dh_diplomatist.persist.mapper.IdcBusinessMapper">
<resultMap id="BaseResultMap" type="com.ccsens.dh_diplomatist.bean.po.IdcBusiness">
<mapper namespace="com.ccsens.ptos_diplomatist.persist.mapper.IdcBusinessMapper">
<resultMap id="BaseResultMap" type="com.ccsens.ptos_diplomatist.bean.po.IdcBusiness">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="code" jdbcType="VARCHAR" property="code" />
@ -73,7 +73,7 @@
<sql id="Base_Column_List">
id, name, code, description, creator_id, operator, created_at, updated_at, rec_status
</sql>
<select id="selectByExample" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcBusinessExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcBusinessExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
@ -97,13 +97,13 @@
delete from t_idc_business
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcBusinessExample">
<delete id="deleteByExample" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcBusinessExample">
delete from t_idc_business
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcBusiness">
<insert id="insert" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcBusiness">
insert into t_idc_business (id, name, code,
description, creator_id, operator,
created_at, updated_at, rec_status
@ -113,7 +113,7 @@
#{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
)
</insert>
<insert id="insertSelective" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcBusiness">
<insert id="insertSelective" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcBusiness">
insert into t_idc_business
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -174,7 +174,7 @@
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcBusinessExample" resultType="java.lang.Long">
<select id="countByExample" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcBusinessExample" resultType="java.lang.Long">
select count(*) from t_idc_business
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
@ -230,7 +230,7 @@
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcBusiness">
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcBusiness">
update t_idc_business
<set>
<if test="name != null">
@ -260,7 +260,7 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcBusiness">
<update id="updateByPrimaryKey" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcBusiness">
update t_idc_business
set name = #{name,jdbcType=VARCHAR},
code = #{code,jdbcType=VARCHAR},

18
dh_diplomatist/src/main/resources/mapper_raw/IdcDomainBusinessMapper.xml → ptos_diplomatist/src/main/resources/mapper_raw/IdcDomainBusinessMapper.xml

@ -1,7 +1,7 @@
<?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.ccsens.dh_diplomatist.persist.mapper.IdcDomainBusinessMapper">
<resultMap id="BaseResultMap" type="com.ccsens.dh_diplomatist.bean.po.IdcDomainBusiness">
<mapper namespace="com.ccsens.ptos_diplomatist.persist.mapper.IdcDomainBusinessMapper">
<resultMap id="BaseResultMap" type="com.ccsens.ptos_diplomatist.bean.po.IdcDomainBusiness">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="domain_id" jdbcType="BIGINT" property="domainId" />
<result column="business_id" jdbcType="BIGINT" property="businessId" />
@ -75,7 +75,7 @@
id, domain_id, business_id, url, app_id, secret, operator, created_at, updated_at,
rec_status
</sql>
<select id="selectByExample" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcDomainBusinessExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcDomainBusinessExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
@ -99,13 +99,13 @@
delete from t_idc_domain_business
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcDomainBusinessExample">
<delete id="deleteByExample" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcDomainBusinessExample">
delete from t_idc_domain_business
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcDomainBusiness">
<insert id="insert" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcDomainBusiness">
insert into t_idc_domain_business (id, domain_id, business_id,
url, app_id, secret,
operator, created_at, updated_at,
@ -115,7 +115,7 @@
#{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
#{recStatus,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcDomainBusiness">
<insert id="insertSelective" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcDomainBusiness">
insert into t_idc_domain_business
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -182,7 +182,7 @@
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcDomainBusinessExample" resultType="java.lang.Long">
<select id="countByExample" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcDomainBusinessExample" resultType="java.lang.Long">
select count(*) from t_idc_domain_business
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
@ -242,7 +242,7 @@
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcDomainBusiness">
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcDomainBusiness">
update t_idc_domain_business
<set>
<if test="domainId != null">
@ -275,7 +275,7 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcDomainBusiness">
<update id="updateByPrimaryKey" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcDomainBusiness">
update t_idc_domain_business
set domain_id = #{domainId,jdbcType=BIGINT},
business_id = #{businessId,jdbcType=BIGINT},

18
dh_diplomatist/src/main/resources/mapper_raw/IdcDomainMapper.xml → ptos_diplomatist/src/main/resources/mapper_raw/IdcDomainMapper.xml

@ -1,7 +1,7 @@
<?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.ccsens.dh_diplomatist.persist.mapper.IdcDomainMapper">
<resultMap id="BaseResultMap" type="com.ccsens.dh_diplomatist.bean.po.IdcDomain">
<mapper namespace="com.ccsens.ptos_diplomatist.persist.mapper.IdcDomainMapper">
<resultMap id="BaseResultMap" type="com.ccsens.ptos_diplomatist.bean.po.IdcDomain">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="code" jdbcType="VARCHAR" property="code" />
@ -84,7 +84,7 @@
id, name, code, intro, url, host, self, pub, polling, answer, last_update_time, last_ask_time,
last_answer_time, public_key, private_key, operator, created_at, updated_at, rec_status
</sql>
<select id="selectByExample" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcDomainExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcDomainExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
@ -108,13 +108,13 @@
delete from t_idc_domain
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcDomainExample">
<delete id="deleteByExample" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcDomainExample">
delete from t_idc_domain
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcDomain">
<insert id="insert" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcDomain">
insert into t_idc_domain (id, name, code,
intro, url, host, self,
pub, polling, answer,
@ -130,7 +130,7 @@
#{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
)
</insert>
<insert id="insertSelective" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcDomain">
<insert id="insertSelective" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcDomain">
insert into t_idc_domain
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -251,7 +251,7 @@
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcDomainExample" resultType="java.lang.Long">
<select id="countByExample" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcDomainExample" resultType="java.lang.Long">
select count(*) from t_idc_domain
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
@ -347,7 +347,7 @@
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcDomain">
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcDomain">
update t_idc_domain
<set>
<if test="name != null">
@ -407,7 +407,7 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcDomain">
<update id="updateByPrimaryKey" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcDomain">
update t_idc_domain
set name = #{name,jdbcType=VARCHAR},
code = #{code,jdbcType=VARCHAR},

18
dh_diplomatist/src/main/resources/mapper_raw/IdcUserDomainMapper.xml → ptos_diplomatist/src/main/resources/mapper_raw/IdcUserDomainMapper.xml

@ -1,7 +1,7 @@
<?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.ccsens.dh_diplomatist.persist.mapper.IdcUserDomainMapper">
<resultMap id="BaseResultMap" type="com.ccsens.dh_diplomatist.bean.po.IdcUserDomain">
<mapper namespace="com.ccsens.ptos_diplomatist.persist.mapper.IdcUserDomainMapper">
<resultMap id="BaseResultMap" type="com.ccsens.ptos_diplomatist.bean.po.IdcUserDomain">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="user_id" jdbcType="BIGINT" property="userId" />
<result column="domain_id" jdbcType="BIGINT" property="domainId" />
@ -79,7 +79,7 @@
id, user_id, domain_id, domain_user_id, name, gender, avatar_url, country, province,
city, operator, created_at, updated_at, rec_status
</sql>
<select id="selectByExample" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcUserDomainExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcUserDomainExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
@ -103,13 +103,13 @@
delete from t_idc_user_domain
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcUserDomainExample">
<delete id="deleteByExample" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcUserDomainExample">
delete from t_idc_user_domain
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcUserDomain">
<insert id="insert" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcUserDomain">
insert into t_idc_user_domain (id, user_id, domain_id,
domain_user_id, name, gender,
avatar_url, country, province,
@ -121,7 +121,7 @@
#{city,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP},
#{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcUserDomain">
<insert id="insertSelective" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcUserDomain">
insert into t_idc_user_domain
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -212,7 +212,7 @@
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcUserDomainExample" resultType="java.lang.Long">
<select id="countByExample" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcUserDomainExample" resultType="java.lang.Long">
select count(*) from t_idc_user_domain
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
@ -288,7 +288,7 @@
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcUserDomain">
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcUserDomain">
update t_idc_user_domain
<set>
<if test="userId != null">
@ -333,7 +333,7 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcUserDomain">
<update id="updateByPrimaryKey" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcUserDomain">
update t_idc_user_domain
set user_id = #{userId,jdbcType=BIGINT},
domain_id = #{domainId,jdbcType=BIGINT},

18
dh_diplomatist/src/main/resources/mapper_raw/IdcUserMapper.xml → ptos_diplomatist/src/main/resources/mapper_raw/IdcUserMapper.xml

@ -1,7 +1,7 @@
<?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.ccsens.dh_diplomatist.persist.mapper.IdcUserMapper">
<resultMap id="BaseResultMap" type="com.ccsens.dh_diplomatist.bean.po.IdcUser">
<mapper namespace="com.ccsens.ptos_diplomatist.persist.mapper.IdcUserMapper">
<resultMap id="BaseResultMap" type="com.ccsens.ptos_diplomatist.bean.po.IdcUser">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="id_card" jdbcType="VARCHAR" property="idCard" />
<result column="phone" jdbcType="VARCHAR" property="phone" />
@ -71,7 +71,7 @@
<sql id="Base_Column_List">
id, id_card, phone, operator, created_at, updated_at, rec_status
</sql>
<select id="selectByExample" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcUserExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcUserExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
@ -95,13 +95,13 @@
delete from t_idc_user
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcUserExample">
<delete id="deleteByExample" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcUserExample">
delete from t_idc_user
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcUser">
<insert id="insert" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcUser">
insert into t_idc_user (id, id_card, phone,
operator, created_at, updated_at,
rec_status)
@ -109,7 +109,7 @@
#{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
#{recStatus,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcUser">
<insert id="insertSelective" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcUser">
insert into t_idc_user
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -158,7 +158,7 @@
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcUserExample" resultType="java.lang.Long">
<select id="countByExample" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcUserExample" resultType="java.lang.Long">
select count(*) from t_idc_user
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
@ -206,7 +206,7 @@
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcUser">
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcUser">
update t_idc_user
<set>
<if test="idCard != null">
@ -230,7 +230,7 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.ccsens.dh_diplomatist.bean.po.IdcUser">
<update id="updateByPrimaryKey" parameterType="com.ccsens.ptos_diplomatist.bean.po.IdcUser">
update t_idc_user
set id_card = #{idCard,jdbcType=VARCHAR},
phone = #{phone,jdbcType=VARCHAR},

0
dh_diplomatist/src/main/resources/mybatis/mybatis-config.xml → ptos_diplomatist/src/main/resources/mybatis/mybatis-config.xml

0
dh_ht/.gitignore → ptos_tall/.gitignore

0
dh_ht/mvnw → ptos_tall/mvnw

0
dh_ht/mvnw.cmd → ptos_tall/mvnw.cmd

8
dh_ptos/pom.xml → ptos_tall/pom.xml

@ -3,16 +3,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>ccsens_dh</artifactId>
<artifactId>ccsens_ptos</artifactId>
<groupId>com.ccsens</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>dh_ptos</artifactId>
<artifactId>ptos_tall</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>dh_ptos</name>
<name>ptos_tall</name>
<description>Demo project for Spring Boot</description>
<properties>
@ -65,7 +65,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<mainClass>com.ccsens.dh_ptos.DhPtosApplication</mainClass>
<mainClass>com.ccsens.ptos_tall.PtosTallApplication</mainClass>
<!--<skip>true</skip>-->
</configuration>
<executions>

8
dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/DhDiplomatistApplication.java → ptos_tall/src/main/java/com/ccsens/ptos_tall/PtosTallApplication.java

@ -1,4 +1,4 @@
package com.ccsens.dh_diplomatist;
package com.ccsens.ptos_tall;
import com.ccsens.cloudutil.ribbon.RibbonConfiguration;
import org.mybatis.spring.annotation.MapperScan;
@ -15,7 +15,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
/**
* @author
*/
@MapperScan(basePackages = {"com.ccsens.dh_diplomatist.persist.*","com.ccsens.common.persist.*"})
@MapperScan(basePackages = {"com.ccsens.ptos_tall.persist.*","com.ccsens.common.persist.*"})
@ServletComponentScan
@EnableAsync
@EnableScheduling
@ -24,10 +24,10 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@EnableFeignClients(basePackages = "com.ccsens.cloudutil.feign")
@SpringBootApplication
@ComponentScan(basePackages = "com.ccsens", excludeFilters = { @ComponentScan.Filter(type= FilterType.ASSIGNABLE_TYPE, value = RibbonConfiguration.class)})
public class DhDiplomatistApplication {
public class PtosTallApplication {
public static void main(String[] args) {
SpringApplication.run(DhDiplomatistApplication.class, args);
SpringApplication.run(PtosTallApplication.class, args);
}
}

2
dh_ht/src/main/java/com/ccsens/dh_ht/api/DebugController.java → ptos_tall/src/main/java/com/ccsens/ptos_tall/api/DebugController.java

@ -1,4 +1,4 @@
package com.ccsens.dh_ht.api;
package com.ccsens.ptos_tall.api;
import com.ccsens.util.JsonResponse;
import io.swagger.annotations.Api;

14
dh_ht/src/main/java/com/ccsens/dh_ht/api/ProjectController.java → ptos_tall/src/main/java/com/ccsens/ptos_tall/api/ProjectController.java

@ -1,8 +1,8 @@
package com.ccsens.dh_ht.api;
package com.ccsens.ptos_tall.api;
import com.ccsens.dh_ht.bean.dto.ProjectDto;
import com.ccsens.dh_ht.bean.vo.ProjectVo;
import com.ccsens.dh_ht.service.IProjectService;
import com.ccsens.ptos_tall.bean.dto.ProjectDto;
import com.ccsens.ptos_tall.bean.vo.ProjectVo;
import com.ccsens.ptos_tall.service.IProjectService;
import com.ccsens.util.JsonResponse;
import com.ccsens.util.bean.dto.QueryDto;
import io.swagger.annotations.Api;
@ -32,10 +32,10 @@ public class ProjectController {
@ApiOperation(value = "查询用户所有域下所有业务内的所有项目", notes = "")
@RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<ProjectVo.DomainInfo>> queryDomainByUser(@ApiParam @Validated @RequestBody QueryDto<ProjectDto.QueryProjectDto> params) throws Exception{
public JsonResponse<List<ProjectVo.ProjectInfo>> queryDomainByUser(@ApiParam @Validated @RequestBody QueryDto<ProjectDto.QueryProjectDto> params) throws Exception{
log.info("查询用户所有域下所有业务内的所有项目:{}",params);
List<ProjectVo.DomainInfo> domainInfoList = projectService.queryDomainByUser(params.getParam(),params.getUserId());
List<ProjectVo.ProjectInfo> projectInfoList = projectService.queryDomainByUser(params.getParam(),params.getUserId());
log.info("查询用户所有域下所有业务内的所有项目");
return JsonResponse.newInstance().ok(domainInfoList);
return JsonResponse.newInstance().ok(projectInfoList);
}
}

2
dh_ht/src/main/java/com/ccsens/dh_ht/api/UserController.java → ptos_tall/src/main/java/com/ccsens/ptos_tall/api/UserController.java

@ -1,4 +1,4 @@
package com.ccsens.dh_ht.api;
package com.ccsens.ptos_tall.api;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;

2
dh_ht/src/main/java/com/ccsens/dh_ht/bean/dto/ProjectDto.java → ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/dto/ProjectDto.java

@ -1,4 +1,4 @@
package com.ccsens.dh_ht.bean.dto;
package com.ccsens.ptos_tall.bean.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

183
ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/po/SysBusiness.java

@ -0,0 +1,183 @@
package com.ccsens.ptos_tall.bean.po;
import java.io.Serializable;
import java.util.Date;
public class SysBusiness implements Serializable {
private Long id;
private String name;
private String code;
private String description;
private String url;
private String appId;
private String secret;
private Long creatorId;
private Long lastAskTime;
private Long lastAnswerTime;
private Byte type;
private Long operator;
private Date createdAt;
private Date updatedAt;
private Byte recStatus;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name == null ? null : name.trim();
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code == null ? null : code.trim();
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description == null ? null : description.trim();
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url == null ? null : url.trim();
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId == null ? null : appId.trim();
}
public String getSecret() {
return secret;
}
public void setSecret(String secret) {
this.secret = secret == null ? null : secret.trim();
}
public Long getCreatorId() {
return creatorId;
}
public void setCreatorId(Long creatorId) {
this.creatorId = creatorId;
}
public Long getLastAskTime() {
return lastAskTime;
}
public void setLastAskTime(Long lastAskTime) {
this.lastAskTime = lastAskTime;
}
public Long getLastAnswerTime() {
return lastAnswerTime;
}
public void setLastAnswerTime(Long lastAnswerTime) {
this.lastAnswerTime = lastAnswerTime;
}
public Byte getType() {
return type;
}
public void setType(Byte type) {
this.type = type;
}
public Long getOperator() {
return operator;
}
public void setOperator(Long operator) {
this.operator = operator;
}
public Date getCreatedAt() {
return createdAt;
}
public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}
public Date getUpdatedAt() {
return updatedAt;
}
public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
}
public Byte getRecStatus() {
return recStatus;
}
public void setRecStatus(Byte recStatus) {
this.recStatus = recStatus;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", name=").append(name);
sb.append(", code=").append(code);
sb.append(", description=").append(description);
sb.append(", url=").append(url);
sb.append(", appId=").append(appId);
sb.append(", secret=").append(secret);
sb.append(", creatorId=").append(creatorId);
sb.append(", lastAskTime=").append(lastAskTime);
sb.append(", lastAnswerTime=").append(lastAnswerTime);
sb.append(", type=").append(type);
sb.append(", operator=").append(operator);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append("]");
return sb.toString();
}
}

1161
ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/po/SysBusinessExample.java

File diff suppressed because it is too large

19
dh_ht/src/main/java/com/ccsens/dh_ht/bean/vo/ProjectVo.java → ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/vo/ProjectVo.java

@ -1,4 +1,4 @@
package com.ccsens.dh_ht.bean.vo;
package com.ccsens.ptos_tall.bean.vo;
import cn.hutool.core.util.ObjectUtil;
import com.ccsens.util.WebConstant;
@ -61,6 +61,10 @@ public class ProjectVo {
private byte status;
@ApiModelProperty("访问路径)")
private String url;
@ApiModelProperty("所属域code")
private String domainCode;
@ApiModelProperty("所属业务code")
private String businessCode;
@ApiModelProperty("子项目")
private List<ProjectInfo> sonProjectList;
@JsonIgnore
@ -81,6 +85,19 @@ public class ProjectVo {
}
return this.status;
}
public ProjectInfo() {
}
public ProjectInfo(Long id, String name, Long startTime, Long endTime, String url, String domainCode, String businessCode) {
this.id = id;
this.name = name;
this.startTime = startTime;
this.endTime = endTime;
this.url = url;
this.domainCode = domainCode;
this.businessCode = businessCode;
}
}
}

4
dh_ptos/src/main/java/com/ccsens/dh_ptos/config/BeanConfig.java → ptos_tall/src/main/java/com/ccsens/ptos_tall/config/BeanConfig.java

@ -1,6 +1,6 @@
package com.ccsens.dh_ptos.config;
package com.ccsens.ptos_tall.config;
import com.ccsens.dh_ptos.intercept.MybatisInterceptor;
import com.ccsens.ptos_tall.intercept.MybatisInterceptor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save