Skip to content

I
ims-ci-test
提交 d7afd6af 作者: xiaowang
操作

服务整合

上级 81f80204
正在显示 包含 149 行增加 和 824 行删除
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Applet.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Applet.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年9月17日 下午1:52:40
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Assign.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Assign.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年11月5日 下午10:37:17
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Auto.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Auto.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年12月8日 下午5:34:49
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Confirm.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Confirm.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年11月11日 下午9:27:23
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Create.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Create.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年8月28日 下午5:37:44
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Freeze.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Freeze.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年9月18日 上午11:22:40
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/IdCardContrast.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/IdCardContrast.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author changwei
* @version 创建时间：2021年9月24日 下午13:58:24
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Others.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Others.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年11月19日 下午12:49:07
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Page.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Page.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年8月28日 下午5:37:58
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Query.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Query.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年12月1日 下午1:50:11
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Rebate.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Rebate.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年10月29日 下午7:51:46
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Refund.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Refund.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年12月6日 下午10:09:47
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Schedule.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Schedule.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年11月6日 上午11:23:04
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Send.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Send.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年12月3日 下午11:11:49
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Share.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Share.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年12月8日 下午2:14:41
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/StartWork.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/StartWork.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年11月8日 下午5:27:12
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Take.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Take.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年12月4日 下午1:11:57
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/model/group/Update.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/model/group/Update.java
package com.mmc.csf.flyer.model.group;
package com.mmc.csf.release.model.group;
/**
* @author 作者 geDuo
* @version 创建时间：2021年8月28日 下午5:37:52
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/qo/BaseInfoQO.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/qo/BaseInfoQO.java
package com.mmc.csf.flyer.qo;
package com.mmc.csf.release.qo;
import com.mmc.csf.flyer.model.group.Freeze;
import com.mmc.csf.flyer.model.group.Page;
import com.mmc.csf.release.model.group.Freeze;
import com.mmc.csf.release.model.group.Page;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/vo/DronePilotLicenseVO.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/vo/DronePilotLicenseVO.java
package com.mmc.csf.flyer.vo;
package com.mmc.csf.release.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
/**
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/vo/FlightSkillsVO.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/vo/FlightSkillsVO.java
package com.mmc.csf.flyer.vo;
package com.mmc.csf.release.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
......
csf-common/csf-common-model/src/main/java/com/mmc/csf/flyer/vo/RegistrationVO.java → csf-common/csf-common-model/src/main/java/com/mmc/csf/release/vo/RegistrationVO.java
package com.mmc.csf.flyer.vo;
package com.mmc.csf.release.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
......
csf-common/csf-common-util/src/main/java/com/mmc/csf/common/util/page/PageResult.java
......@@ -2,7 +2,7 @@ package com.mmc.csf.common.util.page;
import java.io.Serializable;
import com.mmc.csf.flyer.qo.BaseInfoQO;
import com.mmc.csf.release.qo.BaseInfoQO;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
......
forum-service/pom.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.mmc.csf</groupId>
<artifactId>iuav-ims</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>forum-service</artifactId>
<dependencies>
<!-- 引入 Web 功能 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- 健康监控 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<!-- Eureka 客户端, 客户端向 Eureka Server 注册的时候会提供一系列的元数据信息, 例如: 主机, 端口, 健康检查url等
Eureka Server 接受每个客户端发送的心跳信息, 如果在某个配置的超时时间内未接收到心跳信息, 实例会被从注册列表中移除 -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- 引入 Feign, 可以以声明的方式调用微服务 -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<!-- 使用okhttp-feign-连接池技术 -->
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-okhttp</artifactId>
</dependency>
<!-- 引入服务容错 Hystrix 的依赖 -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- mybatis驱动&Druid数据源-start -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- mybatis驱动&Druid数据源-end -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.mmc.csf.common</groupId>
<artifactId>csf-common-model</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.mmc.csf.common</groupId>
<artifactId>csf-common-util</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<!-- RabbitMQ -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
</dependency>
<!-- easypoi导出 -->
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-base</artifactId>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-web</artifactId>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
</dependency>
</dependencies>
<!-- SpringBoot的Maven插件, 能够以Maven的方式为应用提供SpringBoot的支持，可以将 SpringBoot应用打包为可执行的jar或war文件,
然后以通常的方式运行SpringBoot应用 -->
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
<resources>
<!--需要动态添加的资源 -->
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<!--读取打包命令中指定的环境 -->
<include>**/*.yml</include>
<include>**/*.xml</include>
<include>**/*.properties</include>
</includes>
</resource>
</resources>
</build>
</project>
\ No newline at end of file
forum-service/src/main/java/com/mmc/csf/forum/ForumApplication.java deleted 100644 → 0
package com.mmc.csf.forum;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
/**
* @Author LW
* @date 2023/5/13 10:39
* 概要：
// */
//@EnableFeignClients(basePackages = "com.mmc.csf.starter.client") // 所有FeignClient放在client-feign-springboot-starter里面进行管理
//@EnableCircuitBreaker
//@EnableEurekaClient
@SpringBootApplication
public class ForumApplication {
public static void main(String[] args) {
SpringApplication.run(ForumApplication.class, args);
}
}
forum-service/src/main/resources/application-beta.yml deleted 100644 → 0
#Application
server:
port: 50002
servlet:
context-path: /uavgoods
#spring
spring:
application:
name: uavgoods
#Database
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://mysql:3306/uav_mall_goods?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
username: csftester
password: csf-TEST-m1200
# Druid数据源配置
type: com.alibaba.druid.pool.DruidDataSource
druid:
initial-size: 10 #初始化连接池大小
min-idle: 10 #最小大小
max-active: 50 #最大大小
max-wait: 60000 #获取连接时最大等待时间，单位毫秒
time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
min-evictable-idle-time-millis: 300000 #配置一个连接在池中最小生存的时间，单位是毫秒
validation-query: SELECT 1 FROM DUAL #用来检测连接是否有效的sql
test-while-idle: true #申请连接的时候检测，建议配置为true，不影响性能，并且保证安全性
testOnBorrow: false #获取连接时执行检测，建议关闭，影响性能
testOnReturn: false #归还连接时执行检测，建议关闭，影响性能
pool-prepared-statements: false #是否开启PSCache，PSCache对支持游标的数据库性能提升巨大，oracle建议开启，mysql下建议关闭
filters: stat,wall #配置扩展插件，常用的插件有=>stat:监控统计 log4j:日志 wall:防御sql注入
filter:
wall:
config:
multi-statement-allow: true
db-type: mysql
enabled: true
connection-properties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 #打开慢sql记录和延迟时间
web-stat-filter:
url-pattern: /*
exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
enabled: true
stat-view-servlet:
enabled: true
login-username: druid
login-password: druid
#cloud
cloud:
loadbalancer:
retry:
enabled: true
#Redis
redis:
database: 0
host: redis
password: mmc@redis123
port: 6379
#连接池
lettuce:
shutdown-timeout: 1000 # 关闭超时时间-ms
pool:
#最大连接个数
max-active: 30
#等待时间-ms
max-wait: 1000ms
#最大空闲
max-idle: 8
#初始化最小
min-idle: 1
#rabbitMQ
rabbitmq:
host: rabbitmq
port: 5672
username: admin
password: mmc123456
virtual-host: /
listener:
simple:
#acknowledge-mode: manual #设置确认模式手工确认
concurrency: 3 #消费者最小数量
max-concurrency: 10 # 消费者最大数量
# 一般消费者自动签收模式下可以添加下面配置，用于消费抛出异常后进行消息重新投递设置
retry:
enabled: true #是否开启消费者重试（为false时关闭消费者重试）
max-attempts: 3 # 最大重试重新投递消息次数
initial-interval: 900s #重试重新投递消息间隔时间（单位秒）
default-requeue-rejected: false #重试次数超过上面的设置之后是否丢弃(消费者listener抛出异常，是否重回队列，默认true：重回队列， false为不重回队列(结合死信交换机))
#eureka eureka.client.register-with-eureka=true
eureka:
instance:
prefer-ip-address: true
ip-address: mgoods
instance-id: ${eureka.instance.ip-address}:${server.port}@${random.int}
status-page-url: https://testapi.sharefly.mmcuav.cn/${server.servlet.context-path}/swagger-ui.html
client:
fetch-registry: true
service-url:
defaultZone: http://edmin:sharefly1200@eureka:20080/eureka/
#logging
logging:
level:
com:
mmc:
csf: DEBUG
#mybatis
mybatis:
executor-type: simple
mapper-locations: classpath:mapper/**/*.xml
type-aliases-package: com.mmc.csf
configuration:
map-underscore-to-camel-case: true
#feign
feign:
client:
config:
default:
connect-timeout: 3000
read-timeout: 6000
#Okhttp参数配置
httpclient:
enabled: false
okhttp:
enabled: true
hystrix:
enabled: true
hystrix:
command:
default:
execution:
isolation:
thread:
# hystrix 超时时间
timeoutInMilliseconds: 9000
#ribbon-ribbo和hystrix时间取最小的生效，feign和ribbon的超时时间只能选其一生效feign优先级高于ribbon
ribbon:
okhttp:
enabled: true
mmc:
appid: 80001
url: http://121.37.224.147
companycode: MMC
#logstash服务器地址
logstash:
host: 10.86.210.18
#logstash端口
port: 8084
wechat:
sub:
appid: wx5c6a105a0ddca4c5
secret: 96c75255dd26f82f8d55e15b59e101c7
rabbitmq:
enabled: true
exchange: REPOORDER_WX_API_DIRECT_TEST
forum-service/src/main/resources/application-dev.yml deleted 100644 → 0
#Application
server:
port: 20001
servlet:
context-path: /forum
#spring
spring:
application:
name: forum
#Database
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://rm-wz9dd796t4j1giz6t2o.mysql.rds.aliyuncs.com:3306/iuav_ims?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
username: tmj
password: MMC@2022&MYSQL
# Druid数据源配置
type: com.alibaba.druid.pool.DruidDataSource
druid:
initial-size: 1 #初始化连接池大小
min-idle: 1 #最小大小
max-active: 1 #最大大小
max-wait: 60000 #获取连接时最大等待时间，单位毫秒
time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
min-evictable-idle-time-millis: 300000 #配置一个连接在池中最小生存的时间，单位是毫秒
validation-query: SELECT 1 FROM DUAL #用来检测连接是否有效的sql
test-while-idle: true #申请连接的时候检测，建议配置为true，不影响性能，并且保证安全性
testOnBorrow: false #获取连接时执行检测，建议关闭，影响性能
testOnReturn: false #归还连接时执行检测，建议关闭，影响性能
pool-prepared-statements: false #是否开启PSCache，PSCache对支持游标的数据库性能提升巨大，oracle建议开启，mysql下建议关闭
filters: stat,wall #配置扩展插件，常用的插件有=>stat:监控统计 log4j:日志 wall:防御sql注入
filter:
wall:
config:
multi-statement-allow: true
db-type: mysql
enabled: true
connection-properties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 #打开慢sql记录和延迟时间
web-stat-filter:
url-pattern: /*
exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
enabled: true
stat-view-servlet:
enabled: true
login-username: druid
login-password: druid
#cloud
cloud:
loadbalancer:
retry:
enabled: true
#Redis
redis:
database: 0
host: 119.23.248.181
password: mmc@redis123
port: 6379
#连接池
lettuce:
shutdown-timeout: 1000 # 关闭超时时间-ms
pool:
#最大连接个数
max-active: 30
#等待时间-ms
max-wait: 1000ms
#最大空闲
max-idle: 8
#初始化最小
min-idle: 1
#rabbitMQ
rabbitmq:
host: 119.23.248.181
port: 5672
username: admin
password: mmc123456
virtual-host: /
listener:
simple:
#acknowledge-mode: manual #设置确认模式手工确认
concurrency: 3 #消费者最小数量
max-concurrency: 10 # 消费者最大数量
# 一般消费者自动签收模式下可以添加下面配置，用于消费抛出异常后进行消息重新投递设置
retry:
enabled: true #是否开启消费者重试（为false时关闭消费者重试）
max-attempts: 3 # 最大重试重新投递消息次数
initial-interval: 900s #重试重新投递消息间隔时间（单位秒）
default-requeue-rejected: false #重试次数超过上面的设置之后是否丢弃(消费者listener抛出异常，是否重回队列，默认true：重回队列， false为不重回队列(结合死信交换机))
#eureka eureka.client.register-with-eureka=true
eureka:
instance:
prefer-ip-address: true
ip-address: 127.0.0.1
instance-id: ${eureka.instance.ip-address}:${server.port}@${random.int}
status-page-url: http://${eureka.instance.ip-address}:${server.port}${server.servlet.context-path}/swagger-ui.html
client:
fetch-registry: true
service-url:
defaultZone: http://edmin:sharefly1200@127.0.0.1:20080/eureka/
#logging
logging:
level:
com:
mmc:
csf: DEBUG
#mybatis
mybatis:
executor-type: simple
mapper-locations: classpath:mapper/**/*.xml
type-aliases-package: com.mmc.csf
configuration:
map-underscore-to-camel-case: true
##feign
#feign:
# client:
# config:
# default:
# connect-timeout: 3000
# read-timeout: 6000
# #Okhttp参数配置
# httpclient:
# enabled: false
# okhttp:
# enabled: true
# hystrix:
# enabled: true
#hystrix:
# command:
# default:
# execution:
# isolation:
# thread:
# # hystrix 超时时间
# timeoutInMilliseconds: 9000
##ribbon-ribbo和hystrix时间取最小的生效，feign和ribbon的超时时间只能选其一生效feign优先级高于ribbon
#ribbon:
# okhttp:
# enabled: true
#mmc:
# appid: 80001
# url: http://121.37.224.147
# companycode: MMC
#
##logstash服务器地址
#logstash:
# host: 10.86.210.18
##logstash端口
# port: 8084
#
#
#wechat:
# sub:
# appid: wx5c6a105a0ddca4c5
# secret: 96c75255dd26f82f8d55e15b59e101c7
#
#rabbitmq:
# enabled: false
# exchange: REPOORDER_WX_API_DIRECT_DEV
#
## 查看健康情况-开发分支配置则可-其余分支请勿配置
#management:
# endpoints:
# web:
# exposure:
# include: "*"
\ No newline at end of file
forum-service/src/main/resources/application-product.yml deleted 100644 → 0
#Application
server:
port: 50002
servlet:
context-path: /uavgoods
#spring
spring:
application:
name: uavgoods
#Database
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://mysql:3306/uav_mall_goods?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
username: csfmysql
password: csf-DB-m1200
# Druid数据源配置
type: com.alibaba.druid.pool.DruidDataSource
druid:
initial-size: 10 #初始化连接池大小
min-idle: 10 #最小大小
max-active: 50 #最大大小
max-wait: 60000 #获取连接时最大等待时间，单位毫秒
time-between-eviction-runs-millis: 60000 #配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
min-evictable-idle-time-millis: 300000 #配置一个连接在池中最小生存的时间，单位是毫秒
validation-query: SELECT 1 FROM DUAL #用来检测连接是否有效的sql
test-while-idle: true #申请连接的时候检测，建议配置为true，不影响性能，并且保证安全性
testOnBorrow: false #获取连接时执行检测，建议关闭，影响性能
testOnReturn: false #归还连接时执行检测，建议关闭，影响性能
pool-prepared-statements: false #是否开启PSCache，PSCache对支持游标的数据库性能提升巨大，oracle建议开启，mysql下建议关闭
filters: stat,wall #配置扩展插件，常用的插件有=>stat:监控统计 log4j:日志 wall:防御sql注入
filter:
wall:
config:
multi-statement-allow: true
db-type: mysql
enabled: true
connection-properties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 #打开慢sql记录和延迟时间
web-stat-filter:
url-pattern: /*
exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
enabled: true
stat-view-servlet:
enabled: true
login-username: druid
login-password: druid
#cloud
cloud:
loadbalancer:
retry:
enabled: true
#Redis
redis:
database: 0
host: redis
password: mmc@redis123
port: 6379
#连接池
lettuce:
shutdown-timeout: 1000 # 关闭超时时间-ms
pool:
#最大连接个数
max-active: 30
#等待时间-ms
max-wait: 1000ms
#最大空闲
max-idle: 8
#初始化最小
min-idle: 1
#rabbitMQ
rabbitmq:
host: 120.25.213.190
port: 5672
username: admin
password: mmc123456
virtual-host: /
listener:
simple:
#acknowledge-mode: manual #设置确认模式手工确认
concurrency: 3 #消费者最小数量
max-concurrency: 10 # 消费者最大数量
# 一般消费者自动签收模式下可以添加下面配置，用于消费抛出异常后进行消息重新投递设置
retry:
enabled: true #是否开启消费者重试（为false时关闭消费者重试）
max-attempts: 3 # 最大重试重新投递消息次数
initial-interval: 900s #重试重新投递消息间隔时间（单位秒）
default-requeue-rejected: false #重试次数超过上面的设置之后是否丢弃(消费者listener抛出异常，是否重回队列，默认true：重回队列， false为不重回队列(结合死信交换机))
#eureka eureka.client.register-with-eureka=true
eureka:
instance:
prefer-ip-address: true
ip-address: mgoods
instance-id: ${eureka.instance.ip-address}:${server.port}@${random.int}
client:
fetch-registry: true
service-url:
defaultZone: http://edmin:sharefly1200@eureka:20080/eureka/
#logging
logging:
level:
com:
mmc:
csf: DEBUG
#mybatis
mybatis:
executor-type: simple
mapper-locations: classpath:mapper/**/*.xml
type-aliases-package: com.mmc.csf
configuration:
map-underscore-to-camel-case: true
#feign
feign:
client:
config:
default:
connect-timeout: 3000
read-timeout: 6000
#Okhttp参数配置
httpclient:
enabled: false
okhttp:
enabled: true
hystrix:
enabled: true
hystrix:
command:
default:
execution:
isolation:
thread:
# hystrix 超时时间
timeoutInMilliseconds: 9000
#ribbon-ribbo和hystrix时间取最小的生效，feign和ribbon的超时时间只能选其一生效feign优先级高于ribbon
ribbon:
okhttp:
enabled: true
mmc:
appid: 80001
url: http://121.37.224.147
companycode: MMC
wechat:
sub:
appid: wx5c6a105a0ddca4c5
secret: 96c75255dd26f82f8d55e15b59e101c7
rabbitmq:
enabled: true
exchange: REPOORDER_WX_API_DIRECT_PROD
forum-service/src/main/resources/application.yml deleted 100644 → 0
spring:
profiles:
active: dev
---
spring:
profiles: dev
---
spring:
profiles: beta
---
spring:
profiles: product
forum-service/src/main/resources/banner.txt deleted 100644 → 0
_____ _ __ _
/ ____| | / _| |
| (___ | |__ __ _ _ __ ___ | |_| |_ _
\___ \| '_ \ / _` | '__/ _ \ | _| | | | |
____) | | | | (_| | | | __/ | | | | |_| |
|_____/|_| |_|\__,_|_| \___| |_| |_|\__, |
__/ |
|___/
\ No newline at end of file
forum-service/src/main/resources/logback-spring.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml" />
<appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>139.159.142.254:6003</destination>
<!-- 日志输出编码 -->
<encoder charset="UTF-8"
class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
<providers>
<timestamp>
<timeZone>UTC</timeZone>
</timestamp>
<pattern>
<pattern>
{
"logLevel": "%level",
"serviceName": "${springAppName:-}",
"pid": "${PID:-}",
"thread": "%thread",
"class": "%logger{40}",
"rest": "%message"
}
</pattern>
</pattern>
</providers>
</encoder>
</appender>
<root level="INFO">
<appender-ref ref="LOGSTASH" />
<appender-ref ref="CONSOLE" />
</root>
</configuration>
pom.xml
......@@ -4,7 +4,7 @@
<artifactId>iuav-ims</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>飞行培训管理系统</name>
<name>信息发布管理系统</name>
<description>培训相关</description>
<parent>
......@@ -58,8 +58,8 @@
<!-- 引入swagger-bootstrap-ui包 -->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId>
<version>1.8.5</version>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>2.0.5</version>
</dependency>
<dependency>
......@@ -197,8 +197,7 @@
</repository>
</repositories>
<modules>
<module>flyer-service</module>
<module>release-service</module>
<module>csf-common</module>
<module>forum-service</module>
</modules>
</project>
\ No newline at end of file
flyer-service/pom.xml → release-service/pom.xml
......@@ -9,7 +9,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>flyer-service</artifactId>
<artifactId>release-service</artifactId>
<dependencies>
<!-- 引入 Web 功能 -->
......
flyer-service/src/main/java/com/mmc/csf/flyer/FlyerApplication.java → release-service/src/main/java/com/mmc/csf/release/ReleaseApplication.java
package com.mmc.csf.flyer;
package com.mmc.csf.release;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
......@@ -12,8 +12,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
//@EnableCircuitBreaker
//@EnableEurekaClient
@SpringBootApplication
public class FlyerApplication {
public class ReleaseApplication {
public static void main(String[] args) {
SpringApplication.run(FlyerApplication.class, args);
SpringApplication.run(ReleaseApplication.class, args);
}
}
release-service/src/main/java/com/mmc/csf/release/config/Knife4jConfiguration.java 0 → 100644
package com.mmc.csf.release.config;
import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
/**
* @author:zhenjie
* @Date:2023/5/16 10:07
*/
@Configuration
@EnableSwagger2
@EnableKnife4j
public class Knife4jConfiguration {
@Bean(value = "defaultApi2")
public Docket defaultApi2() {
Docket docket=new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo())
//分组名称
.groupName("信息发布服务")
.select()
//这里指定Controller扫描包路径
.apis(RequestHandlerSelectors.basePackage("com.mmc.csf.release.controller"))
.paths(PathSelectors.any())
.build();
return docket;
}
private ApiInfo apiInfo(){
return new ApiInfoBuilder()
.title("iuav信息发布相关")
.description("swagger-bootstrap-ui-demo RESTful APIs")
.termsOfServiceUrl("https://www.iuav.com/")
.contact("group@qq.com")
.version("1.0")
.build();
}
}
forum-service/src/main/java/com/mmc/csf/forum/controller/DynamicController.java → release-service/src/main/java/com/mmc/csf/release/controller/DynamicController.java
package com.mmc.csf.forum.controller;
package com.mmc.csf.release.controller;
import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.forum.service.DynamicService;
import com.mmc.csf.forum.vo.CommentAndReplyVO;
import com.mmc.csf.forum.vo.CommentVO;
import com.mmc.csf.forum.vo.DynamicVO;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import com.mmc.csf.release.service.DynamicService;
import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author LW
* @date 2023/5/15 10:29
* 概要：动态信息控制层
*/
@Api(tags = {"web-小程序-论坛社区-模块"})
@RestController
@RequestMapping("/dynamic")
public class DynamicController {
......
flyer-service/src/main/java/com/mmc/csf/flyer/controller/FlyerTrainingController.java → release-service/src/main/java/com/mmc/csf/release/controller/FlyerTrainingController.java
package com.mmc.csf.flyer.controller;
package com.mmc.csf.release.controller;
import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.flyer.service.FlyerTrainingService;
import com.mmc.csf.flyer.vo.DronePilotLicenseVO;
import com.mmc.csf.flyer.vo.FlightSkillsVO;
import com.mmc.csf.flyer.vo.RegistrationVO;
import com.mmc.csf.release.service.FlyerTrainingService;
import com.mmc.csf.release.vo.DronePilotLicenseVO;
import com.mmc.csf.release.vo.FlightSkillsVO;
import com.mmc.csf.release.vo.RegistrationVO;
import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
......@@ -16,7 +16,7 @@ import javax.annotation.Resource;
* @date 2023/5/13 11:00
* 概要：
*/
@Api(tags = {"web/小程序-飞手培训-模块"})
@Api(tags = {"web-小程序-飞手培训-模块"})
@RestController
@RequestMapping("/curriculum/")
public class FlyerTrainingController {
......
forum-service/src/main/java/com/mmc/csf/forum/dao/CommentDAO.java → release-service/src/main/java/com/mmc/csf/release/dao/CommentDAO.java
package com.mmc.csf.forum.dao;
package com.mmc.csf.release.dao;
import com.mmc.csf.forum.entity.ForumCommentDO;
import com.mmc.csf.forum.vo.CommentAndReplyVO;
import com.mmc.csf.forum.vo.CommentVO;
import org.apache.ibatis.annotations.Mapper;
......
forum-service/src/main/java/com/mmc/csf/forum/dao/DynamicDAO.java → release-service/src/main/java/com/mmc/csf/release/dao/DynamicDAO.java
package com.mmc.csf.forum.dao;
package com.mmc.csf.release.dao;
import com.mmc.csf.forum.entity.ForumDynamicDO;
import com.mmc.csf.forum.entity.ForumImageDO;
import com.mmc.csf.forum.entity.ForumVideoDO;
import com.mmc.csf.forum.vo.DynamicVO;
import com.mmc.csf.release.entity.ForumDynamicDO;
import com.mmc.csf.release.entity.ForumImageDO;
import com.mmc.csf.release.entity.ForumVideoDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......
flyer-service/src/main/java/com/mmc/csf/flyer/dao/FlyerTrainingDao.java → release-service/src/main/java/com/mmc/csf/release/dao/FlyerTrainingDao.java
package com.mmc.csf.flyer.dao;
package com.mmc.csf.release.dao;
import com.mmc.csf.flyer.entity.FlightSkillsDO;
import com.mmc.csf.flyer.entity.PilotRegistrationDO;
import com.mmc.csf.flyer.vo.DronePilotLicenseVO;
import com.mmc.csf.release.entity.FlightSkillsDO;
import com.mmc.csf.release.entity.PilotRegistrationDO;
import com.mmc.csf.release.vo.DronePilotLicenseVO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......
forum-service/src/main/java/com/mmc/csf/forum/dao/LikeDAO.java → release-service/src/main/java/com/mmc/csf/release/dao/LikeDAO.java
package com.mmc.csf.forum.dao;
package com.mmc.csf.release.dao;
import org.apache.ibatis.annotations.Mapper;
......
flyer-service/src/main/java/com/mmc/csf/flyer/entity/FlightSkillsDO.java → release-service/src/main/java/com/mmc/csf/release/entity/FlightSkillsDO.java
package com.mmc.csf.flyer.entity;
package com.mmc.csf.release.entity;
import com.mmc.csf.flyer.vo.FlightSkillsVO;
import com.mmc.csf.release.vo.FlightSkillsVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.xml.soap.Name;
import java.io.Serializable;
/**
......
forum-service/src/main/java/com/mmc/csf/forum/entity/ForumCommentDO.java → release-service/src/main/java/com/mmc/csf/release/entity/ForumCommentDO.java
package com.mmc.csf.forum.entity;
package com.mmc.csf.release.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.util.Date;
import java.io.Serializable;
import java.util.Date;
/**
* 评论表(ForumCommentDO)实体类
......
forum-service/src/main/java/com/mmc/csf/forum/entity/ForumDynamicDO.java → release-service/src/main/java/com/mmc/csf/release/entity/ForumDynamicDO.java
package com.mmc.csf.forum.entity;
package com.mmc.csf.release.entity;
import com.mmc.csf.forum.vo.DynamicVO;
import lombok.AllArgsConstructor;
......@@ -6,9 +6,9 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.io.Serializable;
/**
* 动态信息表(ForumDynamicDO)实体类
......
forum-service/src/main/java/com/mmc/csf/forum/entity/ForumImageDO.java → release-service/src/main/java/com/mmc/csf/release/entity/ForumImageDO.java
package com.mmc.csf.forum.entity;
package com.mmc.csf.release.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.util.Date;
import java.io.Serializable;
import java.util.Date;
/**
* 动态图片表(ForumImageDO)实体类
......
forum-service/src/main/java/com/mmc/csf/forum/entity/ForumLikeDO.java → release-service/src/main/java/com/mmc/csf/release/entity/ForumLikeDO.java
package com.mmc.csf.forum.entity;
package com.mmc.csf.release.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.util.Date;
import java.io.Serializable;
import java.util.Date;
/**
* 点赞表(ForumLikeDO)实体类
......
forum-service/src/main/java/com/mmc/csf/forum/entity/ForumVideoDO.java → release-service/src/main/java/com/mmc/csf/release/entity/ForumVideoDO.java
package com.mmc.csf.forum.entity;
package com.mmc.csf.release.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.util.Date;
import java.io.Serializable;
import java.util.Date;
/**
* 动态视频表(ForumVideoDO)实体类
......
flyer-service/src/main/java/com/mmc/csf/flyer/entity/PilotRegistrationDO.java → release-service/src/main/java/com/mmc/csf/release/entity/PilotRegistrationDO.java
package com.mmc.csf.flyer.entity;
package com.mmc.csf.release.entity;
import com.mmc.csf.flyer.vo.RegistrationVO;
import com.mmc.csf.release.vo.RegistrationVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
......
forum-service/src/main/java/com/mmc/csf/forum/service/DynamicService.java → release-service/src/main/java/com/mmc/csf/release/service/DynamicService.java
package com.mmc.csf.forum.service;
package com.mmc.csf.release.service;
import com.mmc.csf.common.util.page.PageResult;
import com.mmc.csf.common.util.web.ResultBody;
......
flyer-service/src/main/java/com/mmc/csf/flyer/service/FlyerTrainingService.java → release-service/src/main/java/com/mmc/csf/release/service/FlyerTrainingService.java
package com.mmc.csf.flyer.service;
package com.mmc.csf.release.service;
import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.flyer.vo.RegistrationVO;
import com.mmc.csf.release.vo.RegistrationVO;
/**
* @Author LW
......
forum-service/src/main/java/com/mmc/csf/forum/service/impl/DynamicServiceImpl.java → release-service/src/main/java/com/mmc/csf/release/service/impl/DynamicServiceImpl.java
package com.mmc.csf.forum.service.impl;
package com.mmc.csf.release.service.impl;
import com.mmc.csf.common.util.page.PageResult;
import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.forum.dao.CommentDAO;
import com.mmc.csf.forum.dao.DynamicDAO;
import com.mmc.csf.forum.dao.LikeDAO;
import com.mmc.csf.forum.entity.ForumDynamicDO;
import com.mmc.csf.forum.entity.ForumImageDO;
import com.mmc.csf.forum.entity.ForumVideoDO;
import com.mmc.csf.forum.service.DynamicService;
import com.mmc.csf.forum.vo.CommentAndReplyVO;
import com.mmc.csf.forum.vo.CommentVO;
import com.mmc.csf.forum.vo.DynamicVO;
import com.mmc.csf.forum.vo.MediaVO;
import com.mmc.csf.release.dao.CommentDAO;
import com.mmc.csf.release.dao.DynamicDAO;
import com.mmc.csf.release.dao.LikeDAO;
import com.mmc.csf.release.entity.ForumDynamicDO;
import com.mmc.csf.release.entity.ForumImageDO;
import com.mmc.csf.release.entity.ForumVideoDO;
import com.mmc.csf.release.service.DynamicService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......
flyer-service/src/main/java/com/mmc/csf/flyer/service/impl/FlyerTrainingServiceImpl.java → release-service/src/main/java/com/mmc/csf/release/service/impl/FlyerTrainingServiceImpl.java
package com.mmc.csf.flyer.service.impl;
package com.mmc.csf.release.service.impl;
import com.mmc.csf.flyer.dao.FlyerTrainingDao;
import com.mmc.csf.release.dao.FlyerTrainingDao;
import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.flyer.entity.FlightSkillsDO;
import com.mmc.csf.flyer.entity.PilotRegistrationDO;
import com.mmc.csf.flyer.service.FlyerTrainingService;
import com.mmc.csf.flyer.vo.DronePilotLicenseVO;
import com.mmc.csf.flyer.vo.RegistrationVO;
import com.mmc.csf.release.entity.FlightSkillsDO;
import com.mmc.csf.release.entity.PilotRegistrationDO;
import com.mmc.csf.release.service.FlyerTrainingService;
import com.mmc.csf.release.vo.DronePilotLicenseVO;
import com.mmc.csf.release.vo.RegistrationVO;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
......
flyer-service/src/main/resources/application-dev.yml → release-service/src/main/resources/application-dev.yml
......@@ -2,11 +2,11 @@
server:
port: 10001
servlet:
context-path: /flyer
context-path: /release
#spring
spring:
application:
name: flyer
name: release
#Database
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
......
flyer-service/src/main/resources/mapper/FlyerTrainingDao.xml → release-service/src/main/resources/mapper/flyer/FlyerTrainingDao.xml
......@@ -4,14 +4,14 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mmc.csf.flyer.dao.FlyerTrainingDao">
<insert id="insertPilotRegistrationInfo" parameterType="com.mmc.csf.flyer.entity.PilotRegistrationDO"
<insert id="insertPilotRegistrationInfo" parameterType="com.mmc.csf.release.entity.PilotRegistrationDO"
useGeneratedKeys="true" keyProperty="id">
INSERT INTO pilot_registration(id, apply_user_id, `name`, city, telephone, driving_license, province,
uav_license, industry_app_auth, remark)
VALUES (#{id}, #{applyUserId}, #{name}, #{city}, #{telephone}, #{drivingLicense}, #{province}, #{uavLicense},
#{industryAppAuth}, #{remark})
</insert>
<select id="selectAllLicenses" resultType="com.mmc.csf.flyer.vo.DronePilotLicenseVO">
<select id="selectAllLicenses" resultType="com.mmc.csf.release.vo.DronePilotLicenseVO">
select id,
parent_id,
license_type,
......@@ -20,7 +20,7 @@
FROM drone_pilot_license
where is_deleted = 0
</select>
<select id="listIndustryFlightSkills" resultType="com.mmc.csf.flyer.entity.FlightSkillsDO">
<select id="listIndustryFlightSkills" resultType="com.mmc.csf.release.entity.FlightSkillsDO">
select id,
skills_name
from flight_skills
......
forum-service/src/main/resources/mapper/CommentMapper.xml → release-service/src/main/resources/mapper/forum/CommentMapper.xml
......@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mmc.csf.forum.dao.CommentDAO">
<mapper namespace="com.mmc.csf.release.dao.CommentDAO">
<insert id="insertComment" parameterType="com.mmc.csf.forum.vo.CommentVO">
INSERT INTO forum_comment(user_id, dynamic_id, content)
VALUES (#{userId}, #{dynamicId}, #{content})
......
forum-service/src/main/resources/mapper/DynamicMapper.xml → release-service/src/main/resources/mapper/forum/DynamicMapper.xml
......@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mmc.csf.forum.dao.DynamicDAO">
<mapper namespace="com.mmc.csf.release.dao.DynamicDAO">
<insert id="insertPicture">
insert into forum_image(dynamic_id, url)
......@@ -12,7 +12,7 @@
insert into forum_video(dynamic_id, url)
values (#{dynamicId}, #{videoUrl})
</insert>
<insert id="insertDynamic" keyProperty="id" useGeneratedKeys="true" parameterType="com.mmc.csf.forum.entity.ForumDynamicDO">
<insert id="insertDynamic" keyProperty="id" useGeneratedKeys="true" parameterType="com.mmc.csf.release.entity.ForumDynamicDO">
INSERT INTO forum_dynamic(title, user_id, description, location, lat, lon)
VALUES (#{title}, #{userId}, #{description}, #{location}, #{lat}, #{lon})
</insert>
......@@ -37,7 +37,7 @@
where id = #{dynamicId}
and pid = #{pid};
</update>
<select id="getDynamicInfo" resultType="com.mmc.csf.forum.entity.ForumDynamicDO">
<select id="getDynamicInfo" resultType="com.mmc.csf.release.entity.ForumDynamicDO">
select id,
pid,
title,
......@@ -55,7 +55,7 @@
select count(*)
from forum_dynamic where is_deleted = 0
</select>
<select id="dynamicList" resultType="com.mmc.csf.forum.entity.ForumDynamicDO">
<select id="dynamicList" resultType="com.mmc.csf.release.entity.ForumDynamicDO">
select id,
pid,
title,
......@@ -73,7 +73,7 @@
LIMIT #{itemIndex}, #{pageSize}
</select>
<select id="listDynamicPicture" resultType="com.mmc.csf.forum.entity.ForumImageDO">
<select id="listDynamicPicture" resultType="com.mmc.csf.release.entity.ForumImageDO">
select id, url , dynamic_id
from forum_image
where
......@@ -82,7 +82,7 @@
#{item}
</foreach>
</select>
<select id="listDynamicVideo" resultType="com.mmc.csf.forum.entity.ForumVideoDO">
<select id="listDynamicVideo" resultType="com.mmc.csf.release.entity.ForumVideoDO">
select id, url , dynamic_id
from forum_video
where
......
forum-service/src/main/resources/mapper/LikeMapper.xml → release-service/src/main/resources/mapper/forum/LikeMapper.xml
......@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mmc.csf.forum.dao.LikeDAO">
<mapper namespace="com.mmc.csf.release.dao.LikeDAO">
<insert id="insertLike">
INSERT INTO forum_like(user_id, dynamic_id)
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论