1、项目模块结构调整
This commit is contained in:
parent
47e5fef626
commit
ba3038418f
5
pom.xml
5
pom.xml
|
|
@ -8,9 +8,8 @@
|
|||
<artifactId>ruoyi</artifactId>
|
||||
<version>3.3.0</version>
|
||||
|
||||
<name>ruoyi</name>
|
||||
<url>http://www.ruoyi.vip</url>
|
||||
<description>若依微服务系统</description>
|
||||
<name>管理系统</name>
|
||||
<description>微服务系统</description>
|
||||
|
||||
<properties>
|
||||
<ruoyi.version>3.3.0</ruoyi.version>
|
||||
|
|
|
|||
|
|
@ -34,66 +34,61 @@
|
|||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['english:word:add']"
|
||||
>新增
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['english:word:edit']"
|
||||
>修改
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['english:word:remove']"
|
||||
>删除
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['english:word:export']"
|
||||
>导出
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<router-link :to="'/business/english/collect/'" class="link-type">
|
||||
<el-button-group>
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="small"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['english:word:add']"
|
||||
>
|
||||
</el-button>
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="small"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['english:word:edit']"
|
||||
>
|
||||
</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="small"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['english:word:remove']"
|
||||
>
|
||||
</el-button>
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-star-off"
|
||||
size="mini"
|
||||
@click="handleCollect"
|
||||
v-hasPermi="['english:word:collect']"
|
||||
>
|
||||
收藏夹
|
||||
icon="el-icon-download"
|
||||
size="small"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['english:word:export']"
|
||||
>导出
|
||||
</el-button>
|
||||
</router-link>
|
||||
<router-link :to="'/business/english/collect/'" class="link-type">
|
||||
<el-button
|
||||
type="info"
|
||||
plain
|
||||
icon="el-icon-star-off"
|
||||
size="small"
|
||||
@click="handleCollect"
|
||||
v-hasPermi="['english:word:collect']"
|
||||
>
|
||||
收藏夹
|
||||
</el-button>
|
||||
</router-link>
|
||||
</el-button-group>
|
||||
|
||||
</el-col>
|
||||
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
|
|
@ -137,7 +132,7 @@
|
|||
:show-overflow-tooltip="true"/>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip class="item" effect="dark" content="点击查看详情" placement="top-start">
|
||||
<el-tooltip class="item" effect="dark" content="点击查看详情" placement="left-start" :hide-after="3000" :enterable="false">
|
||||
<el-button circle
|
||||
type=""
|
||||
icon="el-icon-view"
|
||||
|
|
@ -389,8 +384,8 @@ export default {
|
|||
|
||||
dateQuery() {
|
||||
//清空时间参数
|
||||
this.queryParams.createTime=null
|
||||
this.queryParams.endCreateTime=null
|
||||
this.queryParams.createTime = null
|
||||
this.queryParams.endCreateTime = null
|
||||
|
||||
this.handleQuery();
|
||||
},
|
||||
|
|
@ -472,9 +467,9 @@ export default {
|
|||
this.queryParams.createTime = null
|
||||
this.queryParams.endCreateTime = null
|
||||
|
||||
this.sortStatus=false
|
||||
this.sortStatus = false
|
||||
this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)//拿到默认排序
|
||||
this.sortStatus=true
|
||||
this.sortStatus = true
|
||||
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<module>xjs-business-statistics</module>
|
||||
<module>xjs-business-webmagic</module>
|
||||
<module>xjs-business-blog</module>
|
||||
<module>xjs-business-srb</module>
|
||||
<module>xjs-project-srb</module>
|
||||
</modules>
|
||||
|
||||
<properties>
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ import org.springframework.boot.SpringApplication;
|
|||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
||||
/**
|
||||
* 英语模块启动器
|
||||
* @author xiejs
|
||||
* @desc
|
||||
* @create 2021-12-29
|
||||
* @since 2021-12-29
|
||||
*/
|
||||
@SpringBootApplication
|
||||
@EnableCustomConfig
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
</modules>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<artifactId>xjs-business-srb</artifactId>
|
||||
<artifactId>xjs-project-srb</artifactId>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>11</maven.compiler.source>
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>xjs-business-srb</artifactId>
|
||||
<artifactId>xjs-project-srb</artifactId>
|
||||
<groupId>com.xjs</groupId>
|
||||
<version>3.3.0</version>
|
||||
</parent>
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
<id>srb-service-base</id>
|
||||
|
||||
<classpath>
|
||||
<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/xjs-business/xjs-business-srb/srb-service-base/target/classes">
|
||||
<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/xjs-business/xjs-project-srb/srb-service-base/target/classes">
|
||||
</dir>
|
||||
</classpath>
|
||||
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<parent>
|
||||
<artifactId>xjs-business-srb</artifactId>
|
||||
<artifactId>xjs-project-srb</artifactId>
|
||||
<groupId>com.xjs</groupId>
|
||||
<version>3.3.0</version>
|
||||
</parent>
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
<id>srb-service-core</id>
|
||||
|
||||
<classpath>
|
||||
<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/xjs-business/xjs-business-srb/srb-service-core/target/classes">
|
||||
<dir name="D:/Dev/IdeaPerject/GitHub/RuoYi-Cloud/xjs-business/xjs-project-srb/srb-service-core/target/classes">
|
||||
</dir>
|
||||
</classpath>
|
||||
|
||||
|
|
@ -18,12 +18,12 @@ public class CodeGenerator {
|
|||
builder.author("xiejs") // 设置作者
|
||||
.enableSwagger() // 开启 swagger 模式
|
||||
.fileOverride() // 覆盖已生成文件
|
||||
.outputDir("D:\\Dev\\IdeaPerject\\GitHub\\RuoYi-Cloud\\xjs-business\\xjs-business-srb\\srb-service-core\\src\\main\\java"); // 指定输出目录
|
||||
.outputDir("D:\\Dev\\IdeaPerject\\GitHub\\RuoYi-Cloud\\xjs-business\\xjs-project-srb\\srb-service-core\\src\\main\\java"); // 指定输出目录
|
||||
})
|
||||
.packageConfig(builder -> {
|
||||
builder.parent("com.xjs.srb") // 设置父包名
|
||||
.moduleName("core") // 设置父包模块名
|
||||
.pathInfo(Collections.singletonMap(OutputFile.mapperXml, "D:\\Dev\\IdeaPerject\\GitHub\\RuoYi-Cloud\\xjs-business\\xjs-business-srb\\srb-service-core\\src\\main\\resources\\mapper")); // 设置mapperXml生成路径
|
||||
.pathInfo(Collections.singletonMap(OutputFile.mapperXml, "D:\\Dev\\IdeaPerject\\GitHub\\RuoYi-Cloud\\xjs-business\\xjs-project-srb\\srb-service-core\\src\\main\\resources\\mapper")); // 设置mapperXml生成路径
|
||||
})
|
||||
.strategyConfig(builder -> {
|
||||
builder.addInclude("integral_grade")
|
||||
Loading…
Reference in New Issue