diff --git a/cloudutil/pom.xml b/cloudutil/pom.xml index 1694667..e00bee4 100644 --- a/cloudutil/pom.xml +++ b/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"> - ccsens_dh + ccsens_ptos com.ccsens 1.0-SNAPSHOT diff --git a/dh_diplomatist/src/main/resources/application.yml b/dh_diplomatist/src/main/resources/application.yml deleted file mode 100644 index 2fb38e5..0000000 --- a/dh_diplomatist/src/main/resources/application.yml +++ /dev/null @@ -1,4 +0,0 @@ -spring: - profiles: - active: dev - include: common, util-dev diff --git a/dh_diplomatist/src/main/resources/logback-spring.xml b/dh_diplomatist/src/main/resources/logback-spring.xml deleted file mode 100644 index 2a2bedc..0000000 --- a/dh_diplomatist/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - logback - - - - - - - - - - - - - - - - - info - - - ${CONSOLE_LOG_PATTERN} - - UTF-8 - - - - - - - - - - ${log.path}/log_debug.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - - ${log.path}/debug/log-debug-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - debug - ACCEPT - DENY - - - - - - - ${log.path}/log_info.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - - ${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - info - ACCEPT - DENY - - - - - - - ${log.path}/log_warn.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - ${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - warn - ACCEPT - DENY - - - - - - - - ${log.path}/log_error.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - ${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - ERROR - ACCEPT - DENY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dh_ht/pom.xml b/dh_ht/pom.xml deleted file mode 100644 index 81078d4..0000000 --- a/dh_ht/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - 4.0.0 - - ccsens_dh - com.ccsens - 1.0-SNAPSHOT - - - dh_ht - - 0.0.1-SNAPSHOT - - dh_ht - - Demo project for Spring Boot - - 1.8 - - - - - - cloudutil - com.ccsens - 1.0-SNAPSHOT - - - - com.ccsens - util - 1.0-SNAPSHOT - compile - - - - wechatutil - com.ccsens - 1.0-SNAPSHOT - - - - - - - - - org.mybatis.generator - mybatis-generator-maven-plugin - 1.3.7 - - ${basedir}/src/main/resources/mbg.xml - true - - - - mysql - mysql-connector-java - 5.1.34 - - - - - org.springframework.boot - spring-boot-maven-plugin - - com.ccsens.dh_ht.DhHtApplication - - - - - - repackage - - - - - - - - - - diff --git a/dh_ht/src/main/java/com/ccsens/dh_ht/config/BeanConfig.java b/dh_ht/src/main/java/com/ccsens/dh_ht/config/BeanConfig.java deleted file mode 100644 index 37336e4..0000000 --- a/dh_ht/src/main/java/com/ccsens/dh_ht/config/BeanConfig.java +++ /dev/null @@ -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; - } -} diff --git a/dh_ht/src/main/java/com/ccsens/dh_ht/config/SpringConfig.java b/dh_ht/src/main/java/com/ccsens/dh_ht/config/SpringConfig.java deleted file mode 100644 index 53eaf75..0000000 --- a/dh_ht/src/main/java/com/ccsens/dh_ht/config/SpringConfig.java +++ /dev/null @@ -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 responseStringConverter() { - StringHttpMessageConverter converter = new StringHttpMessageConverter( - Charset.forName("UTF-8")); - return converter; - } - - @Bean - public HttpMessageConverter responseJsonConverter(){ - MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); - List 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> 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)); - } -} \ No newline at end of file diff --git a/dh_ht/src/main/java/com/ccsens/dh_ht/config/SwaggerConfigure.java b/dh_ht/src/main/java/com/ccsens/dh_ht/config/SwaggerConfigure.java deleted file mode 100644 index 7e38128..0000000 --- a/dh_ht/src/main/java/com/ccsens/dh_ht/config/SwaggerConfigure.java +++ /dev/null @@ -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 setHeaderToken() { - ParameterBuilder tokenPar = new ParameterBuilder(); - List 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; - } -} diff --git a/dh_ht/src/main/java/com/ccsens/dh_ht/service/ProjectService.java b/dh_ht/src/main/java/com/ccsens/dh_ht/service/ProjectService.java deleted file mode 100644 index 3ad3429..0000000 --- a/dh_ht/src/main/java/com/ccsens/dh_ht/service/ProjectService.java +++ /dev/null @@ -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 queryDomainByUser(ProjectDto.QueryProjectDto param, Long userId) { - - return null; - } -} diff --git a/dh_ht/src/main/java/com/ccsens/dh_ht/util/PtOsCodeError.java b/dh_ht/src/main/java/com/ccsens/dh_ht/util/PtOsCodeError.java deleted file mode 100644 index 2817687..0000000 --- a/dh_ht/src/main/java/com/ccsens/dh_ht/util/PtOsCodeError.java +++ /dev/null @@ -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); - -} diff --git a/dh_ht/src/main/java/com/ccsens/dh_ht/util/PtOsConstant.java b/dh_ht/src/main/java/com/ccsens/dh_ht/util/PtOsConstant.java deleted file mode 100644 index ac26704..0000000 --- a/dh_ht/src/main/java/com/ccsens/dh_ht/util/PtOsConstant.java +++ /dev/null @@ -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 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); - } - - -} diff --git a/dh_ht/src/main/resources/application-dev.yml b/dh_ht/src/main/resources/application-dev.yml deleted file mode 100644 index 504a92c..0000000 --- a/dh_ht/src/main/resources/application-dev.yml +++ /dev/null @@ -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/ diff --git a/dh_ht/src/main/resources/application-prod.yml b/dh_ht/src/main/resources/application-prod.yml deleted file mode 100644 index 0aa5e27..0000000 --- a/dh_ht/src/main/resources/application-prod.yml +++ /dev/null @@ -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/ diff --git a/dh_ht/src/main/resources/application-test.yml b/dh_ht/src/main/resources/application-test.yml deleted file mode 100644 index 1d13837..0000000 --- a/dh_ht/src/main/resources/application-test.yml +++ /dev/null @@ -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/ diff --git a/dh_ht/src/main/resources/application.yml b/dh_ht/src/main/resources/application.yml deleted file mode 100644 index 2fb38e5..0000000 --- a/dh_ht/src/main/resources/application.yml +++ /dev/null @@ -1,4 +0,0 @@ -spring: - profiles: - active: dev - include: common, util-dev diff --git a/dh_ptos/.gitignore b/dh_ptos/.gitignore deleted file mode 100644 index 549e00a..0000000 --- a/dh_ptos/.gitignore +++ /dev/null @@ -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/ diff --git a/dh_ptos/mvnw b/dh_ptos/mvnw deleted file mode 100644 index 3c8a553..0000000 --- a/dh_ptos/mvnw +++ /dev/null @@ -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 "$@" diff --git a/dh_ptos/mvnw.cmd b/dh_ptos/mvnw.cmd deleted file mode 100644 index c8d4337..0000000 --- a/dh_ptos/mvnw.cmd +++ /dev/null @@ -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% diff --git a/dh_ptos/src/main/java/com/ccsens/dh_ptos/DhPtosApplication.java b/dh_ptos/src/main/java/com/ccsens/dh_ptos/DhPtosApplication.java deleted file mode 100644 index 2243e41..0000000 --- a/dh_ptos/src/main/java/com/ccsens/dh_ptos/DhPtosApplication.java +++ /dev/null @@ -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); - } - -} diff --git a/dh_ptos/src/main/java/com/ccsens/dh_ptos/api/DebugController.java b/dh_ptos/src/main/java/com/ccsens/dh_ptos/api/DebugController.java deleted file mode 100644 index 58d0a35..0000000 --- a/dh_ptos/src/main/java/com/ccsens/dh_ptos/api/DebugController.java +++ /dev/null @@ -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("测试"); - } - -} diff --git a/dh_ptos/src/main/java/com/ccsens/dh_ptos/api/ProjectController.java b/dh_ptos/src/main/java/com/ccsens/dh_ptos/api/ProjectController.java deleted file mode 100644 index f9fbec9..0000000 --- a/dh_ptos/src/main/java/com/ccsens/dh_ptos/api/ProjectController.java +++ /dev/null @@ -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> queryDomainByUser(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ - log.info("查询用户所有域下所有业务内的所有项目：{}",params); - List domainInfoList = projectService.queryDomainByUser(params.getParam(),params.getUserId()); - log.info("查询用户所有域下所有业务内的所有项目"); - return JsonResponse.newInstance().ok(domainInfoList); - } -} diff --git a/dh_ptos/src/main/java/com/ccsens/dh_ptos/api/UserController.java b/dh_ptos/src/main/java/com/ccsens/dh_ptos/api/UserController.java deleted file mode 100644 index f96fbda..0000000 --- a/dh_ptos/src/main/java/com/ccsens/dh_ptos/api/UserController.java +++ /dev/null @@ -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 { - - -} diff --git a/dh_ptos/src/main/java/com/ccsens/dh_ptos/bean/dto/ProjectDto.java b/dh_ptos/src/main/java/com/ccsens/dh_ptos/bean/dto/ProjectDto.java deleted file mode 100644 index 6a1aa5d..0000000 --- a/dh_ptos/src/main/java/com/ccsens/dh_ptos/bean/dto/ProjectDto.java +++ /dev/null @@ -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; - } - -} diff --git a/dh_ptos/src/main/java/com/ccsens/dh_ptos/bean/vo/ProjectVo.java b/dh_ptos/src/main/java/com/ccsens/dh_ptos/bean/vo/ProjectVo.java deleted file mode 100644 index 464e600..0000000 --- a/dh_ptos/src/main/java/com/ccsens/dh_ptos/bean/vo/ProjectVo.java +++ /dev/null @@ -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 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 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 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; - } - } - -} diff --git a/dh_ptos/src/main/java/com/ccsens/dh_ptos/intercept/MybatisInterceptor.java b/dh_ptos/src/main/java/com/ccsens/dh_ptos/intercept/MybatisInterceptor.java deleted file mode 100644 index 335fe90..0000000 --- a/dh_ptos/src/main/java/com/ccsens/dh_ptos/intercept/MybatisInterceptor.java +++ /dev/null @@ -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; - } - } - -} diff --git a/dh_ptos/src/main/java/com/ccsens/dh_ptos/service/IProjectService.java b/dh_ptos/src/main/java/com/ccsens/dh_ptos/service/IProjectService.java deleted file mode 100644 index 34648d6..0000000 --- a/dh_ptos/src/main/java/com/ccsens/dh_ptos/service/IProjectService.java +++ /dev/null @@ -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 queryDomainByUser(ProjectDto.QueryProjectDto param, Long userId); -} diff --git a/dh_ptos/src/main/java/com/ccsens/dh_ptos/service/ProjectService.java b/dh_ptos/src/main/java/com/ccsens/dh_ptos/service/ProjectService.java deleted file mode 100644 index cd67c16..0000000 --- a/dh_ptos/src/main/java/com/ccsens/dh_ptos/service/ProjectService.java +++ /dev/null @@ -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 queryDomainByUser(ProjectDto.QueryProjectDto param, Long userId) { - - return null; - } -} diff --git a/dh_ptos/src/main/resources/application-common.yml b/dh_ptos/src/main/resources/application-common.yml deleted file mode 100644 index a9fafd1..0000000 --- a/dh_ptos/src/main/resources/application-common.yml +++ /dev/null @@ -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 - diff --git a/dh_ptos/src/main/resources/application.yml b/dh_ptos/src/main/resources/application.yml deleted file mode 100644 index 2fb38e5..0000000 --- a/dh_ptos/src/main/resources/application.yml +++ /dev/null @@ -1,4 +0,0 @@ -spring: - profiles: - active: dev - include: common, util-dev diff --git a/dh_ptos/src/main/resources/druid-dev.yml b/dh_ptos/src/main/resources/druid-dev.yml deleted file mode 100644 index f7298f6..0000000 --- a/dh_ptos/src/main/resources/druid-dev.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/dh_ptos/src/main/resources/druid-prod.yml b/dh_ptos/src/main/resources/druid-prod.yml deleted file mode 100644 index 986eb39..0000000 --- a/dh_ptos/src/main/resources/druid-prod.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/dh_ptos/src/main/resources/druid-test.yml b/dh_ptos/src/main/resources/druid-test.yml deleted file mode 100644 index 32e18fd..0000000 --- a/dh_ptos/src/main/resources/druid-test.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/dh_ptos/src/main/resources/mybatis/mybatis-config.xml b/dh_ptos/src/main/resources/mybatis/mybatis-config.xml deleted file mode 100644 index e5a218d..0000000 --- a/dh_ptos/src/main/resources/mybatis/mybatis-config.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index fd68636..dd09274 100644 --- a/pom.xml +++ b/pom.xml @@ -9,14 +9,14 @@ cloudutil util wechatutil - dh_ptos - dh_diplomatist - dh_ht + ptos_tall + ptos_diplomatist + com.ccsens - ccsens_dh + ccsens_ptos 1.0-SNAPSHOT diff --git a/dh_diplomatist/.gitignore b/ptos_diplomatist/.gitignore similarity index 100% rename from dh_diplomatist/.gitignore rename to ptos_diplomatist/.gitignore diff --git a/dh_diplomatist/mvnw b/ptos_diplomatist/mvnw similarity index 100% rename from dh_diplomatist/mvnw rename to ptos_diplomatist/mvnw diff --git a/dh_diplomatist/mvnw.cmd b/ptos_diplomatist/mvnw.cmd similarity index 100% rename from dh_diplomatist/mvnw.cmd rename to ptos_diplomatist/mvnw.cmd diff --git a/dh_diplomatist/pom.xml b/ptos_diplomatist/pom.xml similarity index 92% rename from dh_diplomatist/pom.xml rename to ptos_diplomatist/pom.xml index ec2b595..193874e 100644 --- a/dh_diplomatist/pom.xml +++ b/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"> 4.0.0 - ccsens_dh + ccsens_ptos com.ccsens 1.0-SNAPSHOT - dh_diplomatist + ptos_diplomatist 0.0.1-SNAPSHOT - dh_diplomatist + ptos_diplomatist Demo project for Spring Boot @@ -71,7 +71,7 @@ org.springframework.boot spring-boot-maven-plugin - com.ccsens.dh_diplomatist.DhDiplomatistApplication + com.ccsens.ptos_diplomatist.PotsDiplomatistApplication diff --git a/dh_ht/src/main/java/com/ccsens/dh_ht/DhHtApplication.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/PotsDiplomatistApplication.java similarity index 75% rename from dh_ht/src/main/java/com/ccsens/dh_ht/DhHtApplication.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/PotsDiplomatistApplication.java index 1d0b9b5..9dc244f 100644 --- a/dh_ht/src/main/java/com/ccsens/dh_ht/DhHtApplication.java +++ b/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); } } diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/DebugController.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/DebugController.java similarity index 92% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/DebugController.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/DebugController.java index 033b7c5..39a7e12 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/DebugController.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/DomainController.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/DomainController.java similarity index 88% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/DomainController.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/DomainController.java index 653111c..e6c42cb 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/DomainController.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/HeartbeatController.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/HeartbeatController.java similarity index 67% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/HeartbeatController.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/HeartbeatController.java index abb5be6..ab4ea16 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/HeartbeatController.java +++ b/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(); + } + } diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/UserController.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/UserController.java similarity index 94% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/UserController.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/api/UserController.java index c9c0ee9..bbf7939 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/api/UserController.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/dto/HeartbeatDto.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/dto/HeartbeatDto.java similarity index 91% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/dto/HeartbeatDto.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/dto/HeartbeatDto.java index 9f528e0..13fc2cb 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/dto/HeartbeatDto.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/dto/UserDto.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/dto/UserDto.java similarity index 90% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/dto/UserDto.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/dto/UserDto.java index c5aa079..e9ce26e 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/dto/UserDto.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcBusiness.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcBusiness.java similarity index 94% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcBusiness.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcBusiness.java index fde211e..d9d21bc 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcBusiness.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcBusinessExample.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcBusinessExample.java similarity index 96% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcBusinessExample.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcBusinessExample.java index 82a95be..b2939ae 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcBusinessExample.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomain.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomain.java similarity index 94% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomain.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomain.java index 1b8351e..3b49194 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomain.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomainBusiness.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomainBusiness.java similarity index 94% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomainBusiness.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomainBusiness.java index 73f0792..caa4c7d 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomainBusiness.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomainBusinessExample.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomainBusinessExample.java similarity index 96% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomainBusinessExample.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomainBusinessExample.java index ffd4e74..945911d 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomainBusinessExample.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomainExample.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomainExample.java similarity index 96% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomainExample.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcDomainExample.java index d3e13fa..74501ce 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcDomainExample.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUser.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUser.java similarity index 93% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUser.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUser.java index 9e6e3f8..09b8a92 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUser.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUserDomain.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUserDomain.java similarity index 94% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUserDomain.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUserDomain.java index 7360ba4..2a1c7c3 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUserDomain.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUserDomainExample.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUserDomainExample.java similarity index 96% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUserDomainExample.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUserDomainExample.java index 4515a3d..ecd9635 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUserDomainExample.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUserExample.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUserExample.java similarity index 96% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUserExample.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/po/IdcUserExample.java index 6011d93..1bda8a5 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/po/IdcUserExample.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/vo/DomainVo.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/vo/DomainVo.java similarity index 93% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/vo/DomainVo.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/bean/vo/DomainVo.java index 6b3772e..a73ea35 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/bean/vo/DomainVo.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/config/BeanConfig.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/config/BeanConfig.java similarity index 80% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/config/BeanConfig.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/config/BeanConfig.java index 73f9e04..1f86169 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/config/BeanConfig.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/config/SpringConfig.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/config/SpringConfig.java similarity index 97% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/config/SpringConfig.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/config/SpringConfig.java index 5e22e30..53e9b04 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/config/SpringConfig.java +++ b/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/"); } /** diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/config/SwaggerConfigure.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/config/SwaggerConfigure.java similarity index 95% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/config/SwaggerConfigure.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/config/SwaggerConfigure.java index 37ea18c..b06c1b3 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/config/SwaggerConfigure.java +++ b/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()); } diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/intercept/MybatisInterceptor.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/intercept/MybatisInterceptor.java similarity index 99% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/intercept/MybatisInterceptor.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/intercept/MybatisInterceptor.java index 8472180..383ef0a 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/intercept/MybatisInterceptor.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/dao/IdcDomainDao.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/dao/IdcDomainDao.java similarity index 75% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/dao/IdcDomainDao.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/dao/IdcDomainDao.java index 47d5baa..a277c97 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/dao/IdcDomainDao.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcBusinessMapper.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcBusinessMapper.java similarity index 79% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcBusinessMapper.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcBusinessMapper.java index ff3ca74..0ec12d8 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcBusinessMapper.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcDomainBusinessMapper.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcDomainBusinessMapper.java similarity index 80% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcDomainBusinessMapper.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcDomainBusinessMapper.java index 65a6a8d..026a2fb 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcDomainBusinessMapper.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcDomainMapper.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcDomainMapper.java similarity index 79% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcDomainMapper.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcDomainMapper.java index 2499a1a..4bebd15 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcDomainMapper.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcUserDomainMapper.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcUserDomainMapper.java similarity index 79% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcUserDomainMapper.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcUserDomainMapper.java index 370e3b0..d06a0ef 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcUserDomainMapper.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcUserMapper.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcUserMapper.java similarity index 79% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcUserMapper.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/persist/mapper/IdcUserMapper.java index 7fd6d98..fffaebe 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/persist/mapper/IdcUserMapper.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/DomainService.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/DomainService.java similarity index 93% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/DomainService.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/DomainService.java index d5e0b6d..9a390bf 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/DomainService.java +++ b/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(); diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/HeartbeatService.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/HeartbeatService.java similarity index 89% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/HeartbeatService.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/HeartbeatService.java index 5339eca..152d463 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/HeartbeatService.java +++ b/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); //请求正确返回则修改最后应答时间，否则无操作 diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/IDomainService.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/IDomainService.java similarity index 67% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/IDomainService.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/IDomainService.java index 7758288..687167e 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/IDomainService.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/IHeartbeatService.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/IHeartbeatService.java similarity index 71% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/IHeartbeatService.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/service/IHeartbeatService.java index a13d2ee..a69d8a1 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/service/IHeartbeatService.java +++ b/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 逗 diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/util/DiplomatistCodeError.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/util/DiplomatistCodeError.java similarity index 84% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/util/DiplomatistCodeError.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/util/DiplomatistCodeError.java index e371f4d..f462f92 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/util/DiplomatistCodeError.java +++ b/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; diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/util/DiplomatistConstant.java b/ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/util/DiplomatistConstant.java similarity index 95% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/util/DiplomatistConstant.java rename to ptos_diplomatist/src/main/java/com/ccsens/ptos_diplomatist/util/DiplomatistConstant.java index e201953..84527d2 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/util/DiplomatistConstant.java +++ b/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; diff --git a/dh_diplomatist/src/main/resources/application-common.yml b/ptos_diplomatist/src/main/resources/application-common.yml similarity index 100% rename from dh_diplomatist/src/main/resources/application-common.yml rename to ptos_diplomatist/src/main/resources/application-common.yml diff --git a/dh_diplomatist/src/main/resources/application-dev.yml b/ptos_diplomatist/src/main/resources/application-dev.yml similarity index 79% rename from dh_diplomatist/src/main/resources/application-dev.yml rename to ptos_diplomatist/src/main/resources/application-dev.yml index 8fb42be..9fc86ea 100644 --- a/dh_diplomatist/src/main/resources/application-dev.yml +++ b/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/ diff --git a/dh_diplomatist/src/main/resources/application-prod.yml b/ptos_diplomatist/src/main/resources/application-prod.yml similarity index 77% rename from dh_diplomatist/src/main/resources/application-prod.yml rename to ptos_diplomatist/src/main/resources/application-prod.yml index bc7a262..5d2606c 100644 --- a/dh_diplomatist/src/main/resources/application-prod.yml +++ b/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/ diff --git a/dh_diplomatist/src/main/resources/application-test.yml b/ptos_diplomatist/src/main/resources/application-test.yml similarity index 78% rename from dh_diplomatist/src/main/resources/application-test.yml rename to ptos_diplomatist/src/main/resources/application-test.yml index a5a8982..dbe76e0 100644 --- a/dh_diplomatist/src/main/resources/application-test.yml +++ b/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/ diff --git a/ptos_diplomatist/src/main/resources/application.yml b/ptos_diplomatist/src/main/resources/application.yml new file mode 100644 index 0000000..5abf242 --- /dev/null +++ b/ptos_diplomatist/src/main/resources/application.yml @@ -0,0 +1,4 @@ +spring: + profiles: + active: prod + include: common, util-prod diff --git a/dh_diplomatist/src/main/resources/druid-dev.yml b/ptos_diplomatist/src/main/resources/druid-dev.yml similarity index 94% rename from dh_diplomatist/src/main/resources/druid-dev.yml rename to ptos_diplomatist/src/main/resources/druid-dev.yml index c761e18..7549c04 100644 --- a/dh_diplomatist/src/main/resources/druid-dev.yml +++ b/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 \ No newline at end of file diff --git a/dh_diplomatist/src/main/resources/druid-prod.yml b/ptos_diplomatist/src/main/resources/druid-prod.yml similarity index 100% rename from dh_diplomatist/src/main/resources/druid-prod.yml rename to ptos_diplomatist/src/main/resources/druid-prod.yml diff --git a/dh_diplomatist/src/main/resources/druid-test.yml b/ptos_diplomatist/src/main/resources/druid-test.yml similarity index 100% rename from dh_diplomatist/src/main/resources/druid-test.yml rename to ptos_diplomatist/src/main/resources/druid-test.yml diff --git a/dh_ht/src/main/resources/logback-spring.xml b/ptos_diplomatist/src/main/resources/logback-spring.xml similarity index 99% rename from dh_ht/src/main/resources/logback-spring.xml rename to ptos_diplomatist/src/main/resources/logback-spring.xml index 5845aad..21142d9 100644 --- a/dh_ht/src/main/resources/logback-spring.xml +++ b/ptos_diplomatist/src/main/resources/logback-spring.xml @@ -9,7 +9,7 @@ logback - + diff --git a/dh_diplomatist/src/main/resources/mapper_dao/SPluginDao.xml b/ptos_diplomatist/src/main/resources/mapper_dao/SPluginDao.xml similarity index 68% rename from dh_diplomatist/src/main/resources/mapper_dao/SPluginDao.xml rename to ptos_diplomatist/src/main/resources/mapper_dao/SPluginDao.xml index e6633d9..0416e86 100644 --- a/dh_diplomatist/src/main/resources/mapper_dao/SPluginDao.xml +++ b/ptos_diplomatist/src/main/resources/mapper_dao/SPluginDao.xml @@ -1,15 +1,15 @@ - + - SELECT * FROM `t_idc_domain` WHERE `code` = #{code} and rec_status = 0 limit 1 - SELECT * FROM `t_idc_domain` WHERE self = 1 and rec_status = 0 limit 1 - SELECT `id`, `name`, @@ -27,7 +27,7 @@ and self = 0 and rec_status = 0 - SELECT `id`, `name`, @@ -41,7 +41,7 @@ WHERE rec_status = 0 - SELECT * FROM `t_idc_domain` WHERE pub = 1 and rec_status = 0 limit 1 \ No newline at end of file diff --git a/dh_diplomatist/src/main/resources/mapper_raw/IdcBusinessMapper.xml b/ptos_diplomatist/src/main/resources/mapper_raw/IdcBusinessMapper.xml similarity index 89% rename from dh_diplomatist/src/main/resources/mapper_raw/IdcBusinessMapper.xml rename to ptos_diplomatist/src/main/resources/mapper_raw/IdcBusinessMapper.xml index acafc93..064dfe6 100644 --- a/dh_diplomatist/src/main/resources/mapper_raw/IdcBusinessMapper.xml +++ b/ptos_diplomatist/src/main/resources/mapper_raw/IdcBusinessMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -73,7 +73,7 @@ id, name, code, description, creator_id, operator, created_at, updated_at, rec_status - select distinct @@ -97,13 +97,13 @@ delete from t_idc_business where id = #{id,jdbcType=BIGINT} - + delete from t_idc_business - + 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 into t_idc_business @@ -174,7 +174,7 @@ - select count(*) from t_idc_business @@ -230,7 +230,7 @@ - + update t_idc_business @@ -260,7 +260,7 @@ where id = #{id,jdbcType=BIGINT} - + update t_idc_business set name = #{name,jdbcType=VARCHAR}, code = #{code,jdbcType=VARCHAR}, diff --git a/dh_diplomatist/src/main/resources/mapper_raw/IdcDomainBusinessMapper.xml b/ptos_diplomatist/src/main/resources/mapper_raw/IdcDomainBusinessMapper.xml similarity index 89% rename from dh_diplomatist/src/main/resources/mapper_raw/IdcDomainBusinessMapper.xml rename to ptos_diplomatist/src/main/resources/mapper_raw/IdcDomainBusinessMapper.xml index 4521291..60a8821 100644 --- a/dh_diplomatist/src/main/resources/mapper_raw/IdcDomainBusinessMapper.xml +++ b/ptos_diplomatist/src/main/resources/mapper_raw/IdcDomainBusinessMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -75,7 +75,7 @@ id, domain_id, business_id, url, app_id, secret, operator, created_at, updated_at, rec_status - select distinct @@ -99,13 +99,13 @@ delete from t_idc_domain_business where id = #{id,jdbcType=BIGINT} - + delete from t_idc_domain_business - + 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 into t_idc_domain_business @@ -182,7 +182,7 @@ - select count(*) from t_idc_domain_business @@ -242,7 +242,7 @@ - + update t_idc_domain_business @@ -275,7 +275,7 @@ where id = #{id,jdbcType=BIGINT} - + update t_idc_domain_business set domain_id = #{domainId,jdbcType=BIGINT}, business_id = #{businessId,jdbcType=BIGINT}, diff --git a/dh_diplomatist/src/main/resources/mapper_raw/IdcDomainMapper.xml b/ptos_diplomatist/src/main/resources/mapper_raw/IdcDomainMapper.xml similarity index 92% rename from dh_diplomatist/src/main/resources/mapper_raw/IdcDomainMapper.xml rename to ptos_diplomatist/src/main/resources/mapper_raw/IdcDomainMapper.xml index 1d2a9c7..3d87d03 100644 --- a/dh_diplomatist/src/main/resources/mapper_raw/IdcDomainMapper.xml +++ b/ptos_diplomatist/src/main/resources/mapper_raw/IdcDomainMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -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 - select distinct @@ -108,13 +108,13 @@ delete from t_idc_domain where id = #{id,jdbcType=BIGINT} - + delete from t_idc_domain - + 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 into t_idc_domain @@ -251,7 +251,7 @@ - select count(*) from t_idc_domain @@ -347,7 +347,7 @@ - + update t_idc_domain @@ -407,7 +407,7 @@ where id = #{id,jdbcType=BIGINT} - + update t_idc_domain set name = #{name,jdbcType=VARCHAR}, code = #{code,jdbcType=VARCHAR}, diff --git a/dh_diplomatist/src/main/resources/mapper_raw/IdcUserDomainMapper.xml b/ptos_diplomatist/src/main/resources/mapper_raw/IdcUserDomainMapper.xml similarity index 90% rename from dh_diplomatist/src/main/resources/mapper_raw/IdcUserDomainMapper.xml rename to ptos_diplomatist/src/main/resources/mapper_raw/IdcUserDomainMapper.xml index 7d0d83d..6110944 100644 --- a/dh_diplomatist/src/main/resources/mapper_raw/IdcUserDomainMapper.xml +++ b/ptos_diplomatist/src/main/resources/mapper_raw/IdcUserDomainMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -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 - select distinct @@ -103,13 +103,13 @@ delete from t_idc_user_domain where id = #{id,jdbcType=BIGINT} - + delete from t_idc_user_domain - + 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 into t_idc_user_domain @@ -212,7 +212,7 @@ - select count(*) from t_idc_user_domain @@ -288,7 +288,7 @@ - + update t_idc_user_domain @@ -333,7 +333,7 @@ where id = #{id,jdbcType=BIGINT} - + update t_idc_user_domain set user_id = #{userId,jdbcType=BIGINT}, domain_id = #{domainId,jdbcType=BIGINT}, diff --git a/dh_diplomatist/src/main/resources/mapper_raw/IdcUserMapper.xml b/ptos_diplomatist/src/main/resources/mapper_raw/IdcUserMapper.xml similarity index 88% rename from dh_diplomatist/src/main/resources/mapper_raw/IdcUserMapper.xml rename to ptos_diplomatist/src/main/resources/mapper_raw/IdcUserMapper.xml index 3dfa506..ee03d89 100644 --- a/dh_diplomatist/src/main/resources/mapper_raw/IdcUserMapper.xml +++ b/ptos_diplomatist/src/main/resources/mapper_raw/IdcUserMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -71,7 +71,7 @@ id, id_card, phone, operator, created_at, updated_at, rec_status - select distinct @@ -95,13 +95,13 @@ delete from t_idc_user where id = #{id,jdbcType=BIGINT} - + delete from t_idc_user - + 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 into t_idc_user @@ -158,7 +158,7 @@ - select count(*) from t_idc_user @@ -206,7 +206,7 @@ - + update t_idc_user @@ -230,7 +230,7 @@ where id = #{id,jdbcType=BIGINT} - + update t_idc_user set id_card = #{idCard,jdbcType=VARCHAR}, phone = #{phone,jdbcType=VARCHAR}, diff --git a/dh_diplomatist/src/main/resources/mybatis/mybatis-config.xml b/ptos_diplomatist/src/main/resources/mybatis/mybatis-config.xml similarity index 100% rename from dh_diplomatist/src/main/resources/mybatis/mybatis-config.xml rename to ptos_diplomatist/src/main/resources/mybatis/mybatis-config.xml diff --git a/dh_ht/.gitignore b/ptos_tall/.gitignore similarity index 100% rename from dh_ht/.gitignore rename to ptos_tall/.gitignore diff --git a/dh_ht/mvnw b/ptos_tall/mvnw similarity index 100% rename from dh_ht/mvnw rename to ptos_tall/mvnw diff --git a/dh_ht/mvnw.cmd b/ptos_tall/mvnw.cmd similarity index 100% rename from dh_ht/mvnw.cmd rename to ptos_tall/mvnw.cmd diff --git a/dh_ptos/pom.xml b/ptos_tall/pom.xml similarity index 92% rename from dh_ptos/pom.xml rename to ptos_tall/pom.xml index 6bdf59d..8105c28 100644 --- a/dh_ptos/pom.xml +++ b/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"> 4.0.0 - ccsens_dh + ccsens_ptos com.ccsens 1.0-SNAPSHOT - dh_ptos + ptos_tall 0.0.1-SNAPSHOT - dh_ptos + ptos_tall Demo project for Spring Boot @@ -65,7 +65,7 @@ org.springframework.boot spring-boot-maven-plugin - com.ccsens.dh_ptos.DhPtosApplication + com.ccsens.ptos_tall.PtosTallApplication diff --git a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/DhDiplomatistApplication.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/PtosTallApplication.java similarity index 81% rename from dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/DhDiplomatistApplication.java rename to ptos_tall/src/main/java/com/ccsens/ptos_tall/PtosTallApplication.java index 010a507..17cdda4 100644 --- a/dh_diplomatist/src/main/java/com/ccsens/dh_diplomatist/DhDiplomatistApplication.java +++ b/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); } } diff --git a/dh_ht/src/main/java/com/ccsens/dh_ht/api/DebugController.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/api/DebugController.java similarity index 93% rename from dh_ht/src/main/java/com/ccsens/dh_ht/api/DebugController.java rename to ptos_tall/src/main/java/com/ccsens/ptos_tall/api/DebugController.java index 1e4419b..265667b 100644 --- a/dh_ht/src/main/java/com/ccsens/dh_ht/api/DebugController.java +++ b/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; diff --git a/dh_ht/src/main/java/com/ccsens/dh_ht/api/ProjectController.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/api/ProjectController.java similarity index 67% rename from dh_ht/src/main/java/com/ccsens/dh_ht/api/ProjectController.java rename to ptos_tall/src/main/java/com/ccsens/ptos_tall/api/ProjectController.java index 2771355..ac39b2d 100644 --- a/dh_ht/src/main/java/com/ccsens/dh_ht/api/ProjectController.java +++ b/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> queryDomainByUser(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + public JsonResponse> queryDomainByUser(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ log.info("查询用户所有域下所有业务内的所有项目：{}",params); - List domainInfoList = projectService.queryDomainByUser(params.getParam(),params.getUserId()); + List projectInfoList = projectService.queryDomainByUser(params.getParam(),params.getUserId()); log.info("查询用户所有域下所有业务内的所有项目"); - return JsonResponse.newInstance().ok(domainInfoList); + return JsonResponse.newInstance().ok(projectInfoList); } } diff --git a/dh_ht/src/main/java/com/ccsens/dh_ht/api/UserController.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/api/UserController.java similarity index 87% rename from dh_ht/src/main/java/com/ccsens/dh_ht/api/UserController.java rename to ptos_tall/src/main/java/com/ccsens/ptos_tall/api/UserController.java index 61d1fbd..fc88a25 100644 --- a/dh_ht/src/main/java/com/ccsens/dh_ht/api/UserController.java +++ b/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; diff --git a/dh_ht/src/main/java/com/ccsens/dh_ht/bean/dto/ProjectDto.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/dto/ProjectDto.java similarity index 87% rename from dh_ht/src/main/java/com/ccsens/dh_ht/bean/dto/ProjectDto.java rename to ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/dto/ProjectDto.java index ef0d86d..aec0767 100644 --- a/dh_ht/src/main/java/com/ccsens/dh_ht/bean/dto/ProjectDto.java +++ b/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; diff --git a/ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/po/SysBusiness.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/po/SysBusiness.java new file mode 100644 index 0000000..468ee17 --- /dev/null +++ b/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(); + } +} \ No newline at end of file diff --git a/ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/po/SysBusinessExample.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/po/SysBusinessExample.java new file mode 100644 index 0000000..703758c --- /dev/null +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/po/SysBusinessExample.java @@ -0,0 +1,1161 @@ +package com.ccsens.ptos_tall.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class SysBusinessExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysBusinessExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andCodeIsNull() { + addCriterion("code is null"); + return (Criteria) this; + } + + public Criteria andCodeIsNotNull() { + addCriterion("code is not null"); + return (Criteria) this; + } + + public Criteria andCodeEqualTo(String value) { + addCriterion("code =", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotEqualTo(String value) { + addCriterion("code <>", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThan(String value) { + addCriterion("code >", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThanOrEqualTo(String value) { + addCriterion("code >=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThan(String value) { + addCriterion("code <", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThanOrEqualTo(String value) { + addCriterion("code <=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLike(String value) { + addCriterion("code like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotLike(String value) { + addCriterion("code not like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeIn(List values) { + addCriterion("code in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotIn(List values) { + addCriterion("code not in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeBetween(String value1, String value2) { + addCriterion("code between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotBetween(String value1, String value2) { + addCriterion("code not between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNull() { + addCriterion("description is null"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNotNull() { + addCriterion("description is not null"); + return (Criteria) this; + } + + public Criteria andDescriptionEqualTo(String value) { + addCriterion("description =", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotEqualTo(String value) { + addCriterion("description <>", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThan(String value) { + addCriterion("description >", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThanOrEqualTo(String value) { + addCriterion("description >=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThan(String value) { + addCriterion("description <", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThanOrEqualTo(String value) { + addCriterion("description <=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLike(String value) { + addCriterion("description like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotLike(String value) { + addCriterion("description not like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionIn(List values) { + addCriterion("description in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotIn(List values) { + addCriterion("description not in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionBetween(String value1, String value2) { + addCriterion("description between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotBetween(String value1, String value2) { + addCriterion("description not between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andUrlIsNull() { + addCriterion("url is null"); + return (Criteria) this; + } + + public Criteria andUrlIsNotNull() { + addCriterion("url is not null"); + return (Criteria) this; + } + + public Criteria andUrlEqualTo(String value) { + addCriterion("url =", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlNotEqualTo(String value) { + addCriterion("url <>", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlGreaterThan(String value) { + addCriterion("url >", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlGreaterThanOrEqualTo(String value) { + addCriterion("url >=", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlLessThan(String value) { + addCriterion("url <", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlLessThanOrEqualTo(String value) { + addCriterion("url <=", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlLike(String value) { + addCriterion("url like", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlNotLike(String value) { + addCriterion("url not like", value, "url"); + return (Criteria) this; + } + + public Criteria andUrlIn(List values) { + addCriterion("url in", values, "url"); + return (Criteria) this; + } + + public Criteria andUrlNotIn(List values) { + addCriterion("url not in", values, "url"); + return (Criteria) this; + } + + public Criteria andUrlBetween(String value1, String value2) { + addCriterion("url between", value1, value2, "url"); + return (Criteria) this; + } + + public Criteria andUrlNotBetween(String value1, String value2) { + addCriterion("url not between", value1, value2, "url"); + return (Criteria) this; + } + + public Criteria andAppIdIsNull() { + addCriterion("app_id is null"); + return (Criteria) this; + } + + public Criteria andAppIdIsNotNull() { + addCriterion("app_id is not null"); + return (Criteria) this; + } + + public Criteria andAppIdEqualTo(String value) { + addCriterion("app_id =", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdNotEqualTo(String value) { + addCriterion("app_id <>", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdGreaterThan(String value) { + addCriterion("app_id >", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdGreaterThanOrEqualTo(String value) { + addCriterion("app_id >=", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdLessThan(String value) { + addCriterion("app_id <", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdLessThanOrEqualTo(String value) { + addCriterion("app_id <=", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdLike(String value) { + addCriterion("app_id like", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdNotLike(String value) { + addCriterion("app_id not like", value, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdIn(List values) { + addCriterion("app_id in", values, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdNotIn(List values) { + addCriterion("app_id not in", values, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdBetween(String value1, String value2) { + addCriterion("app_id between", value1, value2, "appId"); + return (Criteria) this; + } + + public Criteria andAppIdNotBetween(String value1, String value2) { + addCriterion("app_id not between", value1, value2, "appId"); + return (Criteria) this; + } + + public Criteria andSecretIsNull() { + addCriterion("secret is null"); + return (Criteria) this; + } + + public Criteria andSecretIsNotNull() { + addCriterion("secret is not null"); + return (Criteria) this; + } + + public Criteria andSecretEqualTo(String value) { + addCriterion("secret =", value, "secret"); + return (Criteria) this; + } + + public Criteria andSecretNotEqualTo(String value) { + addCriterion("secret <>", value, "secret"); + return (Criteria) this; + } + + public Criteria andSecretGreaterThan(String value) { + addCriterion("secret >", value, "secret"); + return (Criteria) this; + } + + public Criteria andSecretGreaterThanOrEqualTo(String value) { + addCriterion("secret >=", value, "secret"); + return (Criteria) this; + } + + public Criteria andSecretLessThan(String value) { + addCriterion("secret <", value, "secret"); + return (Criteria) this; + } + + public Criteria andSecretLessThanOrEqualTo(String value) { + addCriterion("secret <=", value, "secret"); + return (Criteria) this; + } + + public Criteria andSecretLike(String value) { + addCriterion("secret like", value, "secret"); + return (Criteria) this; + } + + public Criteria andSecretNotLike(String value) { + addCriterion("secret not like", value, "secret"); + return (Criteria) this; + } + + public Criteria andSecretIn(List values) { + addCriterion("secret in", values, "secret"); + return (Criteria) this; + } + + public Criteria andSecretNotIn(List values) { + addCriterion("secret not in", values, "secret"); + return (Criteria) this; + } + + public Criteria andSecretBetween(String value1, String value2) { + addCriterion("secret between", value1, value2, "secret"); + return (Criteria) this; + } + + public Criteria andSecretNotBetween(String value1, String value2) { + addCriterion("secret not between", value1, value2, "secret"); + return (Criteria) this; + } + + public Criteria andCreatorIdIsNull() { + addCriterion("creator_id is null"); + return (Criteria) this; + } + + public Criteria andCreatorIdIsNotNull() { + addCriterion("creator_id is not null"); + return (Criteria) this; + } + + public Criteria andCreatorIdEqualTo(Long value) { + addCriterion("creator_id =", value, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdNotEqualTo(Long value) { + addCriterion("creator_id <>", value, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdGreaterThan(Long value) { + addCriterion("creator_id >", value, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdGreaterThanOrEqualTo(Long value) { + addCriterion("creator_id >=", value, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdLessThan(Long value) { + addCriterion("creator_id <", value, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdLessThanOrEqualTo(Long value) { + addCriterion("creator_id <=", value, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdIn(List values) { + addCriterion("creator_id in", values, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdNotIn(List values) { + addCriterion("creator_id not in", values, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdBetween(Long value1, Long value2) { + addCriterion("creator_id between", value1, value2, "creatorId"); + return (Criteria) this; + } + + public Criteria andCreatorIdNotBetween(Long value1, Long value2) { + addCriterion("creator_id not between", value1, value2, "creatorId"); + return (Criteria) this; + } + + public Criteria andLastAskTimeIsNull() { + addCriterion("last_ask_time is null"); + return (Criteria) this; + } + + public Criteria andLastAskTimeIsNotNull() { + addCriterion("last_ask_time is not null"); + return (Criteria) this; + } + + public Criteria andLastAskTimeEqualTo(Long value) { + addCriterion("last_ask_time =", value, "lastAskTime"); + return (Criteria) this; + } + + public Criteria andLastAskTimeNotEqualTo(Long value) { + addCriterion("last_ask_time <>", value, "lastAskTime"); + return (Criteria) this; + } + + public Criteria andLastAskTimeGreaterThan(Long value) { + addCriterion("last_ask_time >", value, "lastAskTime"); + return (Criteria) this; + } + + public Criteria andLastAskTimeGreaterThanOrEqualTo(Long value) { + addCriterion("last_ask_time >=", value, "lastAskTime"); + return (Criteria) this; + } + + public Criteria andLastAskTimeLessThan(Long value) { + addCriterion("last_ask_time <", value, "lastAskTime"); + return (Criteria) this; + } + + public Criteria andLastAskTimeLessThanOrEqualTo(Long value) { + addCriterion("last_ask_time <=", value, "lastAskTime"); + return (Criteria) this; + } + + public Criteria andLastAskTimeIn(List values) { + addCriterion("last_ask_time in", values, "lastAskTime"); + return (Criteria) this; + } + + public Criteria andLastAskTimeNotIn(List values) { + addCriterion("last_ask_time not in", values, "lastAskTime"); + return (Criteria) this; + } + + public Criteria andLastAskTimeBetween(Long value1, Long value2) { + addCriterion("last_ask_time between", value1, value2, "lastAskTime"); + return (Criteria) this; + } + + public Criteria andLastAskTimeNotBetween(Long value1, Long value2) { + addCriterion("last_ask_time not between", value1, value2, "lastAskTime"); + return (Criteria) this; + } + + public Criteria andLastAnswerTimeIsNull() { + addCriterion("last_answer_time is null"); + return (Criteria) this; + } + + public Criteria andLastAnswerTimeIsNotNull() { + addCriterion("last_answer_time is not null"); + return (Criteria) this; + } + + public Criteria andLastAnswerTimeEqualTo(Long value) { + addCriterion("last_answer_time =", value, "lastAnswerTime"); + return (Criteria) this; + } + + public Criteria andLastAnswerTimeNotEqualTo(Long value) { + addCriterion("last_answer_time <>", value, "lastAnswerTime"); + return (Criteria) this; + } + + public Criteria andLastAnswerTimeGreaterThan(Long value) { + addCriterion("last_answer_time >", value, "lastAnswerTime"); + return (Criteria) this; + } + + public Criteria andLastAnswerTimeGreaterThanOrEqualTo(Long value) { + addCriterion("last_answer_time >=", value, "lastAnswerTime"); + return (Criteria) this; + } + + public Criteria andLastAnswerTimeLessThan(Long value) { + addCriterion("last_answer_time <", value, "lastAnswerTime"); + return (Criteria) this; + } + + public Criteria andLastAnswerTimeLessThanOrEqualTo(Long value) { + addCriterion("last_answer_time <=", value, "lastAnswerTime"); + return (Criteria) this; + } + + public Criteria andLastAnswerTimeIn(List values) { + addCriterion("last_answer_time in", values, "lastAnswerTime"); + return (Criteria) this; + } + + public Criteria andLastAnswerTimeNotIn(List values) { + addCriterion("last_answer_time not in", values, "lastAnswerTime"); + return (Criteria) this; + } + + public Criteria andLastAnswerTimeBetween(Long value1, Long value2) { + addCriterion("last_answer_time between", value1, value2, "lastAnswerTime"); + return (Criteria) this; + } + + public Criteria andLastAnswerTimeNotBetween(Long value1, Long value2) { + addCriterion("last_answer_time not between", value1, value2, "lastAnswerTime"); + return (Criteria) this; + } + + public Criteria andTypeIsNull() { + addCriterion("type is null"); + return (Criteria) this; + } + + public Criteria andTypeIsNotNull() { + addCriterion("type is not null"); + return (Criteria) this; + } + + public Criteria andTypeEqualTo(Byte value) { + addCriterion("type =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(Byte value) { + addCriterion("type <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(Byte value) { + addCriterion("type >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("type >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(Byte value) { + addCriterion("type <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(Byte value) { + addCriterion("type <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("type in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("type not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(Byte value1, Byte value2) { + addCriterion("type between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(Byte value1, Byte value2) { + addCriterion("type not between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andOperatorIsNull() { + addCriterion("operator is null"); + return (Criteria) this; + } + + public Criteria andOperatorIsNotNull() { + addCriterion("operator is not null"); + return (Criteria) this; + } + + public Criteria andOperatorEqualTo(Long value) { + addCriterion("operator =", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotEqualTo(Long value) { + addCriterion("operator <>", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThan(Long value) { + addCriterion("operator >", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThanOrEqualTo(Long value) { + addCriterion("operator >=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThan(Long value) { + addCriterion("operator <", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThanOrEqualTo(Long value) { + addCriterion("operator <=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorIn(List values) { + addCriterion("operator in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotIn(List values) { + addCriterion("operator not in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorBetween(Long value1, Long value2) { + addCriterion("operator between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotBetween(Long value1, Long value2) { + addCriterion("operator not between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/dh_ht/src/main/java/com/ccsens/dh_ht/bean/vo/ProjectVo.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/vo/ProjectVo.java similarity index 78% rename from dh_ht/src/main/java/com/ccsens/dh_ht/bean/vo/ProjectVo.java rename to ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/vo/ProjectVo.java index 9ced019..6e8ec5a 100644 --- a/dh_ht/src/main/java/com/ccsens/dh_ht/bean/vo/ProjectVo.java +++ b/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 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; + } } } diff --git a/dh_ptos/src/main/java/com/ccsens/dh_ptos/config/BeanConfig.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/config/BeanConfig.java similarity index 82% rename from dh_ptos/src/main/java/com/ccsens/dh_ptos/config/BeanConfig.java rename to ptos_tall/src/main/java/com/ccsens/ptos_tall/config/BeanConfig.java index 07fb159..8aacf62 100644 --- a/dh_ptos/src/main/java/com/ccsens/dh_ptos/config/BeanConfig.java +++ b/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; diff --git a/dh_ptos/src/main/java/com/ccsens/dh_ptos/config/SpringConfig.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/config/SpringConfig.java similarity index 97% rename from dh_ptos/src/main/java/com/ccsens/dh_ptos/config/SpringConfig.java rename to ptos_tall/src/main/java/com/ccsens/ptos_tall/config/SpringConfig.java index 1e6b4c4..36e0243 100644 --- a/dh_ptos/src/main/java/com/ccsens/dh_ptos/config/SpringConfig.java +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/config/SpringConfig.java @@ -1,4 +1,4 @@ -package com.ccsens.dh_ptos.config; +package com.ccsens.ptos_tall.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/ptos/service/uploads/"); + .addResourceLocations("file:///home/ptos_tall/server//uploads/"); } /** diff --git a/dh_ptos/src/main/java/com/ccsens/dh_ptos/config/SwaggerConfigure.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/config/SwaggerConfigure.java similarity index 95% rename from dh_ptos/src/main/java/com/ccsens/dh_ptos/config/SwaggerConfigure.java rename to ptos_tall/src/main/java/com/ccsens/ptos_tall/config/SwaggerConfigure.java index 857cbdb..0b2027a 100644 --- a/dh_ptos/src/main/java/com/ccsens/dh_ptos/config/SwaggerConfigure.java +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/config/SwaggerConfigure.java @@ -1,4 +1,4 @@ -package com.ccsens.dh_ptos.config; +package com.ccsens.ptos_tall.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_ptos.api")) + .basePackage("com.ccsens.ptos_tall.api")) .build() .globalOperationParameters(setHeaderToken()); } diff --git a/dh_ht/src/main/java/com/ccsens/dh_ht/intercept/MybatisInterceptor.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/intercept/MybatisInterceptor.java similarity index 99% rename from dh_ht/src/main/java/com/ccsens/dh_ht/intercept/MybatisInterceptor.java rename to ptos_tall/src/main/java/com/ccsens/ptos_tall/intercept/MybatisInterceptor.java index eae54e1..a753eba 100644 --- a/dh_ht/src/main/java/com/ccsens/dh_ht/intercept/MybatisInterceptor.java +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/intercept/MybatisInterceptor.java @@ -1,4 +1,4 @@ -package com.ccsens.dh_ht.intercept; +package com.ccsens.ptos_tall.intercept; import cn.hutool.core.collection.CollectionUtil; import com.ccsens.util.WebConstant; diff --git a/ptos_tall/src/main/java/com/ccsens/ptos_tall/persist/mapper/SysBusinessMapper.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/persist/mapper/SysBusinessMapper.java new file mode 100644 index 0000000..a46142d --- /dev/null +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/persist/mapper/SysBusinessMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.ptos_tall.persist.mapper; + +import com.ccsens.ptos_tall.bean.po.SysBusiness; +import com.ccsens.ptos_tall.bean.po.SysBusinessExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysBusinessMapper { + long countByExample(SysBusinessExample example); + + int deleteByExample(SysBusinessExample example); + + int deleteByPrimaryKey(Long id); + + int insert(SysBusiness record); + + int insertSelective(SysBusiness record); + + List selectByExample(SysBusinessExample example); + + SysBusiness selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") SysBusiness record, @Param("example") SysBusinessExample example); + + int updateByExample(@Param("record") SysBusiness record, @Param("example") SysBusinessExample example); + + int updateByPrimaryKeySelective(SysBusiness record); + + int updateByPrimaryKey(SysBusiness record); +} \ No newline at end of file diff --git a/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/HeartbeatService.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/HeartbeatService.java new file mode 100644 index 0000000..f27dbf9 --- /dev/null +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/HeartbeatService.java @@ -0,0 +1,66 @@ +package com.ccsens.ptos_tall.service; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.CharsetUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +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.ptos_tall.bean.po.SysBusiness; +import com.ccsens.ptos_tall.bean.po.SysBusinessExample; +import com.ccsens.ptos_tall.persist.mapper.SysBusinessMapper; +import com.ccsens.util.RestTemplateUtil; +import com.ccsens.util.exception.BaseException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author 逗 + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class) +public class HeartbeatService{ + @Resource + private SysBusinessMapper businessMapper; + + /** + * 定时发送心跳信息 + */ + @Scheduled(cron="0/30 * * * * ?") + public void sendHeartbeat(){ + //查找业务列表 + SysBusinessExample businessExample = new SysBusinessExample(); + businessExample.clear(); + List sysBusinesses = businessMapper.selectByExample(businessExample); + //循环请求业务 + if(CollectionUtil.isNotEmpty(sysBusinesses)){ + sysBusinesses.forEach(sysBusiness -> { + sysBusiness.setLastAskTime(System.currentTimeMillis()); + businessMapper.updateByPrimaryKeySelective(sysBusiness); + //发送心跳 + String url = sysBusiness.getUrl() + "/heart/tall"; + log.info("调用接口：{}--", url); + String postBody = RestTemplateUtil.postBody(url,null); + + JSONObject jsonObject = JSONObject.parseObject(postBody); + log.info("接口返回：{}", jsonObject); + //请求正确返回则修改最后应答时间，否则无操作 + Integer code = jsonObject.getInteger("code"); + if (code != null && code == 200) { + sysBusiness.setLastAnswerTime(System.currentTimeMillis()); + businessMapper.updateByPrimaryKeySelective(sysBusiness); + } + }); + } + + } +} diff --git a/dh_ht/src/main/java/com/ccsens/dh_ht/service/IProjectService.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/IProjectService.java similarity index 51% rename from dh_ht/src/main/java/com/ccsens/dh_ht/service/IProjectService.java rename to ptos_tall/src/main/java/com/ccsens/ptos_tall/service/IProjectService.java index 348b0c5..3d1ed8c 100644 --- a/dh_ht/src/main/java/com/ccsens/dh_ht/service/IProjectService.java +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/IProjectService.java @@ -1,7 +1,7 @@ -package com.ccsens.dh_ht.service; +package com.ccsens.ptos_tall.service; -import com.ccsens.dh_ht.bean.dto.ProjectDto; -import com.ccsens.dh_ht.bean.vo.ProjectVo; +import com.ccsens.ptos_tall.bean.dto.ProjectDto; +import com.ccsens.ptos_tall.bean.vo.ProjectVo; import java.util.List; @@ -15,5 +15,5 @@ public interface IProjectService { * @param userId userId * @return 返回项目列表 */ - List queryDomainByUser(ProjectDto.QueryProjectDto param, Long userId); + List queryDomainByUser(ProjectDto.QueryProjectDto param, Long userId); } diff --git a/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/ProjectService.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/ProjectService.java new file mode 100644 index 0000000..43143fc --- /dev/null +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/ProjectService.java @@ -0,0 +1,33 @@ +package com.ccsens.ptos_tall.service; + +import com.ccsens.ptos_tall.bean.dto.ProjectDto; +import com.ccsens.ptos_tall.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.ArrayList; +import java.util.List; +/** + * @author 逗 + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class) +public class ProjectService implements IProjectService { + + + @Override + public List queryDomainByUser(ProjectDto.QueryProjectDto param, Long userId) { + List projectInfoList = new ArrayList<>(); + + //TODO 添加测试数据 + projectInfoList.add(new ProjectVo.ProjectInfo(1L,"测试项目1",1641799829000L,1641886229000L,"http://101.201.226.163/gateway/ptos/debug","dh","tall")); + projectInfoList.add(new ProjectVo.ProjectInfo(2L,"测试项目2",1641799829001L,1641886229004L,"http://101.201.226.163/gateway/ptos/debug","dh","tall")); + projectInfoList.add(new ProjectVo.ProjectInfo(3L,"测试项目3",1641799829002L,1641886229005L,"http://101.201.226.163/gateway/ptos/debug","dh","tall")); + projectInfoList.add(new ProjectVo.ProjectInfo(4L,"测试项目4",1641799829003L,1641886229006L,"http://101.201.226.163/gateway/ptos/debug","dh","tall")); + + return projectInfoList; + } +} diff --git a/dh_ptos/src/main/java/com/ccsens/dh_ptos/util/PtOsCodeError.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/util/PtOsCodeError.java similarity index 80% rename from dh_ptos/src/main/java/com/ccsens/dh_ptos/util/PtOsCodeError.java rename to ptos_tall/src/main/java/com/ccsens/ptos_tall/util/PtOsCodeError.java index cc9a967..09de6ca 100644 --- a/dh_ptos/src/main/java/com/ccsens/dh_ptos/util/PtOsCodeError.java +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/util/PtOsCodeError.java @@ -1,4 +1,4 @@ -package com.ccsens.dh_ptos.util; +package com.ccsens.ptos_tall.util; import com.ccsens.util.CodeError; diff --git a/dh_ptos/src/main/java/com/ccsens/dh_ptos/util/PtOsConstant.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/util/PtOsConstant.java similarity index 95% rename from dh_ptos/src/main/java/com/ccsens/dh_ptos/util/PtOsConstant.java rename to ptos_tall/src/main/java/com/ccsens/ptos_tall/util/PtOsConstant.java index 1d861e8..582f37f 100644 --- a/dh_ptos/src/main/java/com/ccsens/dh_ptos/util/PtOsConstant.java +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/util/PtOsConstant.java @@ -1,4 +1,4 @@ -package com.ccsens.dh_ptos.util; +package com.ccsens.ptos_tall.util; import java.util.HashMap; import java.util.Map; diff --git a/dh_ht/src/main/resources/application-common.yml b/ptos_tall/src/main/resources/application-common.yml similarity index 100% rename from dh_ht/src/main/resources/application-common.yml rename to ptos_tall/src/main/resources/application-common.yml diff --git a/dh_ptos/src/main/resources/application-dev.yml b/ptos_tall/src/main/resources/application-dev.yml similarity index 74% rename from dh_ptos/src/main/resources/application-dev.yml rename to ptos_tall/src/main/resources/application-dev.yml index 3444f22..8d7497a 100644 --- a/dh_ptos/src/main/resources/application-dev.yml +++ b/ptos_tall/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: context-path: spring: application: - name: dh_ptos + name: ptostall datasource: type: com.alibaba.druid.pool.DruidDataSource # rabbitmq: @@ -13,10 +13,10 @@ spring: # port: 5672 # username: admin rabbitmq: - host: 127.0.0.1 - password: guest + host: dd.tall.wiki + password: 111111 port: 5672 - username: guest + username: admin redis: database: 0 host: 127.0.0.1 @@ -45,6 +45,6 @@ mybatisCache: timeout: 1000 file: - path: /home/ptos/service/uploads/ - domain: https://test.tall.wiki/gateway/dh_ptos - imgDomain: https://test.tall.wiki/gateway/dh_ptos/uploads/ + path: /home/ptos_tall/server//uploads/ + domain: https://test.tall.wiki/gateway/ptostall + imgDomain: https://test.tall.wiki/gateway/ptostall/uploads/ diff --git a/dh_ptos/src/main/resources/application-prod.yml b/ptos_tall/src/main/resources/application-prod.yml similarity index 75% rename from dh_ptos/src/main/resources/application-prod.yml rename to ptos_tall/src/main/resources/application-prod.yml index af7bd73..e0c9042 100644 --- a/dh_ptos/src/main/resources/application-prod.yml +++ b/ptos_tall/src/main/resources/application-prod.yml @@ -4,7 +4,7 @@ server: context-path: spring: application: - name: dh_ptos + name: ptostall datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: @@ -29,12 +29,12 @@ swagger: enable: true eureka: instance: - ip-address: 121.36.106.168 + ip-address: 101.201.226.21 gatewayUrl: https://www.tall.wiki/gateway/ notGatewayUrl: https://www.tall.wiki/ apiUrl: https://www.tall.wiki/ file: - path: /home/ptos/service/uploads/ - domain: https://www.tall.wiki/gateway/dh_ptos - imgDomain: https://www.tall.wiki/gateway/dh_ptos/uploads/ + path: /home/ptos_tall/server//uploads/ + domain: https://www.tall.wiki/gateway/ptos_tall + imgDomain: https://www.tall.wiki/gateway/ptos_tall/uploads/ diff --git a/dh_ptos/src/main/resources/application-test.yml b/ptos_tall/src/main/resources/application-test.yml similarity index 80% rename from dh_ptos/src/main/resources/application-test.yml rename to ptos_tall/src/main/resources/application-test.yml index 3542416..31865a9 100644 --- a/dh_ptos/src/main/resources/application-test.yml +++ b/ptos_tall/src/main/resources/application-test.yml @@ -4,7 +4,7 @@ server: context-path: spring: application: - name: dh_ptos + name: ptostall datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: @@ -43,6 +43,6 @@ eureka: ip-address: 127.0.0.1 file: - path: /home/ptos/service/uploads/ - domain: https://test.tall.wiki/gateway/dh_ptos - imgDomain: https://test.tall.wiki/gateway/dh_ptos/uploads/ + path: /home/ptos_tall/server//uploads/ + domain: https://test.tall.wiki/gateway/ptos_tall + imgDomain: https://test.tall.wiki/gateway/ptos_tall/uploads/ diff --git a/ptos_tall/src/main/resources/application.yml b/ptos_tall/src/main/resources/application.yml new file mode 100644 index 0000000..5abf242 --- /dev/null +++ b/ptos_tall/src/main/resources/application.yml @@ -0,0 +1,4 @@ +spring: + profiles: + active: prod + include: common, util-prod diff --git a/dh_ht/src/main/resources/druid-dev.yml b/ptos_tall/src/main/resources/druid-dev.yml similarity index 95% rename from dh_ht/src/main/resources/druid-dev.yml rename to ptos_tall/src/main/resources/druid-dev.yml index 1de2452..0e98f98 100644 --- a/dh_ht/src/main/resources/druid-dev.yml +++ b/ptos_tall/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 \ No newline at end of file diff --git a/dh_ht/src/main/resources/druid-prod.yml b/ptos_tall/src/main/resources/druid-prod.yml similarity index 89% rename from dh_ht/src/main/resources/druid-prod.yml rename to ptos_tall/src/main/resources/druid-prod.yml index 986eb39..8e3c3c9 100644 --- a/dh_ht/src/main/resources/druid-prod.yml +++ b/ptos_tall/src/main/resources/druid-prod.yml @@ -29,7 +29,7 @@ spring: 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 + 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 \ No newline at end of file diff --git a/dh_ht/src/main/resources/druid-test.yml b/ptos_tall/src/main/resources/druid-test.yml similarity index 100% rename from dh_ht/src/main/resources/druid-test.yml rename to ptos_tall/src/main/resources/druid-test.yml diff --git a/dh_ptos/src/main/resources/logback-spring.xml b/ptos_tall/src/main/resources/logback-spring.xml similarity index 99% rename from dh_ptos/src/main/resources/logback-spring.xml rename to ptos_tall/src/main/resources/logback-spring.xml index 3d37c64..f427bad 100644 --- a/dh_ptos/src/main/resources/logback-spring.xml +++ b/ptos_tall/src/main/resources/logback-spring.xml @@ -9,7 +9,7 @@ logback - + diff --git a/ptos_tall/src/main/resources/mapper_raw/SysBusinessMapper.xml b/ptos_tall/src/main/resources/mapper_raw/SysBusinessMapper.xml new file mode 100644 index 0000000..ca30098 --- /dev/null +++ b/ptos_tall/src/main/resources/mapper_raw/SysBusinessMapper.xml @@ -0,0 +1,370 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, name, code, description, url, app_id, secret, creator_id, last_ask_time, last_answer_time, + type, operator, created_at, updated_at, rec_status + + + + + delete from t_sys_business + where id = #{id,jdbcType=BIGINT} + + + delete from t_sys_business + + + + + + insert into t_sys_business (id, name, code, + description, url, app_id, + secret, creator_id, last_ask_time, + last_answer_time, type, operator, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, + #{description,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{appId,jdbcType=VARCHAR}, + #{secret,jdbcType=VARCHAR}, #{creatorId,jdbcType=BIGINT}, #{lastAskTime,jdbcType=BIGINT}, + #{lastAnswerTime,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, #{operator,jdbcType=BIGINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_sys_business + + + id, + + + name, + + + code, + + + description, + + + url, + + + app_id, + + + secret, + + + creator_id, + + + last_ask_time, + + + last_answer_time, + + + type, + + + operator, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{code,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{url,jdbcType=VARCHAR}, + + + #{appId,jdbcType=VARCHAR}, + + + #{secret,jdbcType=VARCHAR}, + + + #{creatorId,jdbcType=BIGINT}, + + + #{lastAskTime,jdbcType=BIGINT}, + + + #{lastAnswerTime,jdbcType=BIGINT}, + + + #{type,jdbcType=TINYINT}, + + + #{operator,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_sys_business + + + id = #{record.id,jdbcType=BIGINT}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + code = #{record.code,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + url = #{record.url,jdbcType=VARCHAR}, + + + app_id = #{record.appId,jdbcType=VARCHAR}, + + + secret = #{record.secret,jdbcType=VARCHAR}, + + + creator_id = #{record.creatorId,jdbcType=BIGINT}, + + + last_ask_time = #{record.lastAskTime,jdbcType=BIGINT}, + + + last_answer_time = #{record.lastAnswerTime,jdbcType=BIGINT}, + + + type = #{record.type,jdbcType=TINYINT}, + + + operator = #{record.operator,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_sys_business + set id = #{record.id,jdbcType=BIGINT}, + name = #{record.name,jdbcType=VARCHAR}, + code = #{record.code,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + url = #{record.url,jdbcType=VARCHAR}, + app_id = #{record.appId,jdbcType=VARCHAR}, + secret = #{record.secret,jdbcType=VARCHAR}, + creator_id = #{record.creatorId,jdbcType=BIGINT}, + last_ask_time = #{record.lastAskTime,jdbcType=BIGINT}, + last_answer_time = #{record.lastAnswerTime,jdbcType=BIGINT}, + type = #{record.type,jdbcType=TINYINT}, + operator = #{record.operator,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_sys_business + + + name = #{name,jdbcType=VARCHAR}, + + + code = #{code,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + url = #{url,jdbcType=VARCHAR}, + + + app_id = #{appId,jdbcType=VARCHAR}, + + + secret = #{secret,jdbcType=VARCHAR}, + + + creator_id = #{creatorId,jdbcType=BIGINT}, + + + last_ask_time = #{lastAskTime,jdbcType=BIGINT}, + + + last_answer_time = #{lastAnswerTime,jdbcType=BIGINT}, + + + type = #{type,jdbcType=TINYINT}, + + + operator = #{operator,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_sys_business + set name = #{name,jdbcType=VARCHAR}, + code = #{code,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + url = #{url,jdbcType=VARCHAR}, + app_id = #{appId,jdbcType=VARCHAR}, + secret = #{secret,jdbcType=VARCHAR}, + creator_id = #{creatorId,jdbcType=BIGINT}, + last_ask_time = #{lastAskTime,jdbcType=BIGINT}, + last_answer_time = #{lastAnswerTime,jdbcType=BIGINT}, + type = #{type,jdbcType=TINYINT}, + operator = #{operator,jdbcType=BIGINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/dh_ht/src/main/resources/mybatis/mybatis-config.xml b/ptos_tall/src/main/resources/mybatis/mybatis-config.xml similarity index 100% rename from dh_ht/src/main/resources/mybatis/mybatis-config.xml rename to ptos_tall/src/main/resources/mybatis/mybatis-config.xml diff --git a/util/pom.xml b/util/pom.xml index b805426..34cb416 100644 --- a/util/pom.xml +++ b/util/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"> - ccsens_dh + ccsens_ptos com.ccsens 1.0-SNAPSHOT diff --git a/wechatutil/pom.xml b/wechatutil/pom.xml index 3eb9f87..23aacc9 100644 --- a/wechatutil/pom.xml +++ b/wechatutil/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - ccsens_dh + ccsens_ptos com.ccsens 1.0-SNAPSHOT