Skip to content

B
beyond-clouds
Commit e57d70dc by 段启岩
Options

达梦适配

parent f0ef9bd3
Showing with 97 additions and 78 deletions
pom.xml
......@@ -32,13 +32,13 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.3.0</version>
<version>3.3.2</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
<version>3.3.0</version>
<version>3.3.2</version>
</dependency>
<dependency>
......@@ -160,6 +160,12 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>dm</groupId>
<artifactId>DmJdbcDriver</artifactId>
<version>18</version>
</dependency>
</dependencies>
<build>
......
src/main/java/cn/meteor/beyondclouds/common/generator/CodeGenerator.java
package cn.meteor.beyondclouds.common.generator;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.generator.AutoGenerator;
import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
......@@ -62,19 +63,20 @@ public class CodeGenerator {
// 用户模块
Module.of("user",
"user", "user_auth_app", "user_auth_local", "user_follow"),
"USER", "user_auth_app", "user_auth_local", "user_follow"),
};
// for (Module module :
// modules) {
// execute(module.moduleName, module.include);
// }
for (Module module :
modules) {
execute(module.moduleName, module.include);
}
// execute("blog", "blog_praise");
// execute("post", "post_praise");
// execute("project", "project_praise");
// execute("question", "question_praise");
// execute("app", "app_version");
// execute("user", "user");
}
......@@ -94,10 +96,11 @@ public class CodeGenerator {
// 数据源配置
DataSourceConfig dsc = new DataSourceConfig();
dsc.setUrl("jdbc:mysql://127.0.0.1:3306/beyond_clouds?useUnicode=true&characterEncoding=UTF-8&useSSL=false");
dsc.setDriverName("com.mysql.cj.jdbc.Driver");
dsc.setUsername("root");
dsc.setPassword("100Centa30821%mysql");
dsc.setDbType(DbType.DM);
dsc.setUrl("jdbc:dm://192.168.56.202:5236/DMTEST?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8");
dsc.setDriverName("dm.jdbc.driver.DmDriver");
dsc.setUsername("BEYOND_CLOUDS");
dsc.setPassword("100centa30821");
mpg.setDataSource(dsc);
StrategyConfig strategy = new StrategyConfig();
......
src/main/java/cn/meteor/beyondclouds/config/MyBatisPlusConfig.java
package cn.meteor.beyondclouds.config;
import com.baomidou.mybatisplus.core.config.GlobalConfig;
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.DmDialect;
import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.context.annotation.Bean;
......@@ -26,6 +28,8 @@ public class MyBatisPlusConfig {
paginationInterceptor.setOverflow(false);
paginationInterceptor.setLimit(100);
paginationInterceptor.setCountSqlParser(new JsqlParserCountOptimize(true));
paginationInterceptor.setDialect(new DmDialect());
return paginationInterceptor;
}
}
src/main/java/cn/meteor/beyondclouds/modules/blog/entity/BlogTag.java
......@@ -27,11 +27,9 @@ public class BlogTag implements Serializable {
private static final long serialVersionUID=1L;
@ApiModelProperty(value = "博客主键")
@TableId
private String blogId;
@ApiModelProperty(value = "标签主键")
@TableId
private String tagId;
/**
......
src/main/java/cn/meteor/beyondclouds/modules/blog/mapper/xml/BlogPraiseMapper.xml
......@@ -9,7 +9,7 @@
u.user_avatar,
u.signature,
bp.create_time praise_time
from blog_praise bp, user u
from blog_praise bp, "USER" u
where bp.user_id = u.user_id
and bp.target_id = #{targetId}
and bp.target_type = #{targetType}
......
src/main/java/cn/meteor/beyondclouds/modules/content/entity/Content.java
package cn.meteor.beyondclouds.modules.content.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
......@@ -48,6 +49,7 @@ public class Content implements Serializable {
@JsonInclude(JsonInclude.Include.NON_NULL)
private String subTitle;
@TableField("\"LINK\"")
@ApiModelProperty(value = "访问链接")
@JsonInclude(JsonInclude.Include.NON_NULL)
private String link;
......
src/main/java/cn/meteor/beyondclouds/modules/feedback/entity/Feedback.java
package cn.meteor.beyondclouds.modules.feedback.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
......@@ -37,6 +38,7 @@ public class Feedback implements Serializable {
@ApiModelProperty(value = "反馈内容")
private String content;
@TableField("\"LINK\"")
@ApiModelProperty(value = "链接")
private String link;
......
src/main/java/cn/meteor/beyondclouds/modules/feedback/form/ComplaintForm.java
package cn.meteor.beyondclouds.modules.feedback.form;
import cn.meteor.beyondclouds.core.constant.RegexPatterns;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -34,6 +35,7 @@ public class ComplaintForm {
/**
* 要举报的链接（必填）
*/
@TableField("\"LINK\"")
@NotEmpty(message = "举报链接不能为空")
private String link;
......
src/main/java/cn/meteor/beyondclouds/modules/feedback/form/FeedbackForm.java
package cn.meteor.beyondclouds.modules.feedback.form;
import cn.meteor.beyondclouds.core.constant.RegexPatterns;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -33,6 +34,7 @@ public class FeedbackForm {
/**
* 反馈的链接（可选）
*/
@TableField("\"LINK\"")
private String link;
/**
......
src/main/java/cn/meteor/beyondclouds/modules/post/mapper/xml/PostPraiseMapper.xml
......@@ -8,7 +8,7 @@
u.user_avatar,
u.signature,
pp.create_time praise_time
from post_praise pp, user u
from post_praise pp, "USER" u
where pp.user_id = u.user_id
and pp.target_id = #{targetId}
and pp.target_type = #{targetType}
......
src/main/java/cn/meteor/beyondclouds/modules/question/entity/QuestionTag.java
......@@ -27,11 +27,9 @@ public class QuestionTag implements Serializable {
private static final long serialVersionUID=1L;
@ApiModelProperty(value = "标签ID")
@TableId
private String tagId;
@ApiModelProperty(value = "问题ID")
@TableId
private String questionId;
/**
......
src/main/java/cn/meteor/beyondclouds/modules/topic/mapper/xml/TopicMapper.xml
......@@ -8,7 +8,7 @@
<select id="selectHotSearchPage" resultType="cn.meteor.beyondclouds.modules.topic.dto.TopicDTO">
SELECT t.*,
sd.degree `degree`
sd.degree "degree"
FROM topic t, search_degree sd
WHERE t.topic_id = sd.item_id
AND sd.item_type = 'TOPIC'
......
src/main/java/cn/meteor/beyondclouds/modules/user/entity/User.java
......@@ -2,6 +2,7 @@ package cn.meteor.beyondclouds.modules.user.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -23,6 +24,7 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="User对象", description="用户信息表")
@TableName("\"USER\"")
public class User implements Serializable {
private static final long serialVersionUID=1L;
......
src/main/java/cn/meteor/beyondclouds/modules/user/mapper/xml/UserMapper.xml
......@@ -5,17 +5,17 @@
select
u.*,
u.nick_name user_nick,
us.followed_num `statistics.followed_num`,
us.fans_num `statistics.fans_num`,
us.blog_num `statistics.blog_num`,
us.blog_view_num `statistics.blog_view_num`,
us.project_num `statistics.project_num`,
us.post_num `statistics.post_num`,
us.question_num `statistics.question_num`,
us.question_reply_num `statistics.question_reply_num`,
us.reply_accepted_num `statistics.reply_accepted_num`,
us.visited_num `statistics.visited_num`
from `user` u, user_statistics us
us.followed_num "statistics.followed_num",
us.fans_num "statistics.fans_num",
us.blog_num "statistics.blog_num",
us.blog_view_num "statistics.blog_view_num",
us.project_num "statistics.project_num",
us.post_num "statistics.post_num",
us.question_num "statistics.question_num",
us.question_reply_num "statistics.question_reply_num",
us.reply_accepted_num "statistics.reply_accepted_num",
us.visited_num "statistics.visited_num"
from "USER" u, user_statistics us
where u.user_id = us.user_id
AND us.blog_view_num > 0
order by us.blog_view_num desc
......@@ -25,17 +25,17 @@
select
u.*,
u.nick_name user_nick,
us.followed_num `statistics.followed_num`,
us.fans_num `statistics.fans_num`,
us.blog_num `statistics.blog_num`,
us.blog_view_num `statistics.blog_view_num`,
us.project_num `statistics.project_num`,
us.post_num `statistics.post_num`,
us.question_num `statistics.question_num`,
us.question_reply_num `statistics.question_reply_num`,
us.reply_accepted_num `statistics.reply_accepted_num`,
us.visited_num `statistics.visited_num`
from `user` u, user_statistics us
us.followed_num "statistics.followed_num",
us.fans_num "statistics.fans_num",
us.blog_num "statistics.blog_num",
us.blog_view_num "statistics.blog_view_num",
us.project_num "statistics.project_num",
us.post_num "statistics.post_num",
us.question_num "statistics.question_num",
us.question_reply_num "statistics.question_reply_num",
us.reply_accepted_num "statistics.reply_accepted_num",
us.visited_num "statistics.visited_num"
from "USER" u, user_statistics us
where u.user_id = us.user_id
and u.user_id
in
......@@ -49,17 +49,17 @@
SELECT
u.*,
u.nick_name user_nick,
us.followed_num `statistics.followed_num`,
us.fans_num `statistics.fans_num`,
us.blog_num `statistics.blog_num`,
us.blog_view_num `statistics.blog_view_num`,
us.project_num `statistics.project_num`,
us.post_num `statistics.post_num`,
us.question_num `statistics.question_num`,
us.question_reply_num `statistics.question_reply_num`,
us.reply_accepted_num `statistics.reply_accepted_num`,
us.visited_num `statistics.visited_num`
FROM `user` u, user_statistics us
us.followed_num "statistics.followed_num",
us.fans_num "statistics.fans_num",
us.blog_num "statistics.blog_num",
us.blog_view_num "statistics.blog_view_num",
us.project_num "statistics.project_num",
us.post_num "statistics.post_num",
us.question_num "statistics.question_num",
us.question_reply_num "statistics.question_reply_num",
us.reply_accepted_num "statistics.reply_accepted_num",
us.visited_num "statistics.visited_num"
FROM "USER" u, user_statistics us
WHERE u.user_id = us.user_id
ORDER BY blog_num + project_num + post_num * 0.1 + blog_view_num DESC
</select>
......@@ -69,17 +69,17 @@
SELECT
u.*,
u.nick_name user_nick,
us.followed_num `statistics.followed_num`,
us.fans_num `statistics.fans_num`,
us.blog_num `statistics.blog_num`,
us.blog_view_num `statistics.blog_view_num`,
us.project_num `statistics.project_num`,
us.post_num `statistics.post_num`,
us.question_num `statistics.question_num`,
us.question_reply_num `statistics.question_reply_num`,
us.reply_accepted_num `statistics.reply_accepted_num`,
us.visited_num `statistics.visited_num`
FROM `user` u, user_statistics us
us.followed_num "statistics.followed_num",
us.fans_num "statistics.fans_num",
us.blog_num "statistics.blog_num",
us.blog_view_num "statistics.blog_view_num",
us.project_num "statistics.project_num",
us.post_num "statistics.post_num",
us.question_num "statistics.question_num",
us.question_reply_num "statistics.question_reply_num",
us.reply_accepted_num "statistics.reply_accepted_num",
us.visited_num "statistics.visited_num"
FROM "USER" u, user_statistics us
WHERE u.user_id = us.user_id
ORDER BY blog_num + project_num + post_num + blog_view_num DESC
</select>
......@@ -88,17 +88,17 @@
select
u.*,
u.nick_name user_nick,
us.followed_num `statistics.followed_num`,
us.fans_num `statistics.fans_num`,
us.blog_num `statistics.blog_num`,
us.blog_view_num `statistics.blog_view_num`,
us.project_num `statistics.project_num`,
us.post_num `statistics.post_num`,
us.question_num `statistics.question_num`,
us.question_reply_num `statistics.question_reply_num`,
us.reply_accepted_num `statistics.reply_accepted_num`,
us.visited_num `statistics.visited_num`
from `user` u, user_statistics us
us.followed_num "statistics.followed_num",
us.fans_num "statistics.fans_num",
us.blog_num "statistics.blog_num",
us.blog_view_num "statistics.blog_view_num",
us.project_num "statistics.project_num",
us.post_num "statistics.post_num",
us.question_num "statistics.question_num",
us.question_reply_num "statistics.question_reply_num",
us.reply_accepted_num "statistics.reply_accepted_num",
us.visited_num "statistics.visited_num"
from "USER" u, user_statistics us
where u.user_id = us.user_id
AND us.question_reply_num > 0
order by us.reply_accepted_num desc, us.question_reply_num desc
......
src/main/resources/application-dm.yml
......@@ -2,11 +2,11 @@ spring:
# 数据源
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/beyond_clouds?useUnicode=true&characterEncoding=UTF-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2B8
username: beyond
password: Beyond2020#
driver-class-name: dm.jdbc.driver.DmDriver
url: jdbc:dm://192.168.56.202:5236/DMTEST?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
# url: jdbc:dm://127.0.0.1:5236/DMTEST?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
username: BEYOND_CLOUDS
password: 100centa30821
# 邮箱
mail:
host: smtp.163.com
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment