Merge branch 'master' of http://git.zthymaoyi.com/zyw/cloudNew

.gitignore

@@ -42,7 +42,7 @@ mvnw.cmd
 ### target ###
 /target/
 /unimall-admin-api/target/
-/unimall-app-api/target/
+#/unimall-app-api/target/
 /unimall-biz/target/
 /unimall-data/target/
 /unimall-core/target/

pom.xml

@@ -38,7 +38,7 @@
 		<module>unimall-core</module>
 		<module>unimall-data</module>
 		<module>unimall-biz</module>
-		<module>unimall-app-api</module>
+<!--		<module>unimall-app-api</module>-->
 		<module>unimall-admin-api</module>
 		<module>unimall-launcher</module>
 		<module>unimall-plugin-core</module>

unimall-admin/config/index.js

@@ -16,7 +16,7 @@ module.exports = {
 
         // can be overwritten by process.env.HOST
         // if you want dev by ip, please set host: '0.0.0.0'
-        host: '192.168.110.72',
+        host: '192.168.110.82',
         port: 9527, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
         autoOpenBrowser: true,
         errorOverlay: true,

unimall-admin/src/views/articleManagement/index.vue

@@ -98,8 +98,8 @@
           </el-form-item>
         </el-form>
         <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="序号" align="center" prop="tableId" width="50px" />
+          <!-- <el-table-column type="selection" width="55" align="center" /> -->
+          <!-- <el-table-column label="序号" align="center" prop="tableId" width="50px" /> -->
           <!-- <el-table-column label="" align="center" prop="id" /> -->
           <el-table-column label="文章标题" align="center" prop="articleTitle" />
           <el-table-column label="分类" align="center" prop="classification" />
@@ -116,8 +116,13 @@
                 type="text"
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
-                v-permission="['unimall:management:edit']"
               >修改</el-button>
+              <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -128,8 +133,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
 
@@ -172,8 +177,8 @@ export default {
       opendict:false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         articleTitle: undefined,
         articleIntroduction: undefined,
         coverImage: undefined,

unimall-admin/src/views/carouselManagement/index.vue

@@ -10,15 +10,24 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="页面" prop="title">
+        <el-input
+          v-model="queryParams.classify"
+          placeholder="请输入页面"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
         
-      <el-form-item label="" prop="gmtCreate">
+      <!-- <el-form-item label="" prop="gmtCreate">
         <el-date-picker clearable size="small" style="width: 200px"
           v-model="queryParams.gmtCreate"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -58,10 +67,17 @@
     </el-row>
 
     <el-table v-loading="loading" :data="carouselManagementList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <!-- <el-table-column label="" align="center" prop="id" /> -->
+      
+      <el-table-column label="页面" align="center" prop="classify" />
       <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="轮播图片" align="center" prop="url" />
+      <el-table-column label="轮播图片" align="center" prop="gmtCreate" width="180">
+        <template slot-scope="scope">
+         <img :src="scope.row.url" alt="" style="width:100px;height:50px">
+        </template>
+      </el-table-column>
+      <el-table-column label="轮播图片地址" align="center" prop="url" />
       <el-table-column label="" align="center" prop="gmtCreate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.gmtCreate) }}</span>
@@ -90,8 +106,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
 
@@ -168,8 +184,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         title: undefined,
         url: undefined,
         status: undefined,

unimall-admin/src/views/case/index.vue

@@ -95,8 +95,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
 
@@ -142,8 +142,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         concernedId: undefined,
         followersId: undefined
       },

unimall-admin/src/views/imageManagement/index.vue

@@ -49,8 +49,8 @@
     </el-row>
 
     <el-table v-loading="loading" :data="imageManagementList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" />
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <!-- <el-table-column label="" align="center" prop="id" />role -->
       <el-table-column label="图片地址" align="center" prop="imageUrl" />
       <el-table-column label="图片标题" align="center" prop="imageTitle" />
       <el-table-column label="语言" align="center" prop="language" />
@@ -82,8 +82,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
 
@@ -147,8 +147,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         imageUrl: undefined,
         imageTitle: undefined,
         language: undefined,

unimall-admin/src/views/log/logininfor/index.vue

@@ -105,8 +105,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
   </div>
@@ -135,8 +135,8 @@ export default {
       dateRange: [],
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         ipaddr: undefined,
         userName: undefined,
         status: undefined

unimall-admin/src/views/log/operlog/index.vue

@@ -132,8 +132,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
 
@@ -210,8 +210,8 @@ export default {
       form: {},
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         title: undefined,
         operName: undefined,
         businessType: undefined,

unimall-admin/src/views/messageManagement/index.vue

@@ -58,8 +58,8 @@
     </el-row>
 
     <el-table v-loading="loading" :data="messageManagementList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" />
+      <!-- <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="" align="center" prop="id" /> -->
       <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="电子邮件" align="center" prop="email" />
       <el-table-column label="留言内容" align="center" prop="content" />
@@ -86,8 +86,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
 
@@ -163,8 +163,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         name: undefined,
         phone: undefined,
         email: undefined,

unimall-admin/src/views/monitor/online/index.vue

@@ -57,7 +57,7 @@ export default {
       total: 0,
       // 表格数据
       list: [],
-      pageNum: 1,
+      page: 1,
       pageSize: 10
     }
   },

unimall-admin/src/views/productManagement/index.vue

@@ -98,8 +98,8 @@
           </el-form-item>
         </el-form>
         <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="序号" align="center" prop="tableId" width="50px" />
+          <!-- <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="序号" align="center" prop="tableId" width="50px" /> -->
           <!-- <el-table-column label="" align="center" prop="id" /> -->
           <el-table-column label="产品标题" align="center" prop="productTitle" />
           <el-table-column label="分类" align="center" prop="classification" />
@@ -118,6 +118,12 @@
                 @click="handleUpdate(scope.row)"
                 v-permission="['unimall:management:edit']"
               >修改</el-button>
+              <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -128,8 +134,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
 
@@ -224,8 +230,8 @@ export default {
       opendict:false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         productTitle: undefined,
         productIntroduction: undefined,
         coverImage: undefined,

unimall-admin/src/views/sys/dict/dictData.vue

@@ -104,8 +104,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
 
@@ -177,8 +177,8 @@ export default {
       typeOptions: [],
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         dictName: undefined,
         dictType: undefined,
         status: undefined

unimall-admin/src/views/tools/gen/index.vue

@@ -145,8 +145,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.limit"
       @pagination="getList"
     />
     <!-- 预览界面 -->
@@ -195,8 +195,8 @@ export default {
       dateRange: '',
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        limit: 10,
         tableName: undefined,
         tableComment: undefined
       },

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/tools/gen/GenTableMapper.java

@@ -6,14 +6,13 @@ import org.apache.ibatis.session.RowBounds;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.iotechn.unimall.data.domain.tools.gen.GenTable;
-import com.iotechn.unimall.data.domain.tools.gen.GenTableColumn;
 
 public interface GenTableMapper extends BaseMapper<GenTable>{
 	
 	/**
      * 查询据库列表
      *
-     * @param tableNames 表名称组
+     * @param genTable 表名称组
      * @return 数据库表集合
      */
 	public List<GenTable> selectDbTableList(RowBounds rowBounds,GenTable genTable);

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/tools/gen/GenTableMapper.xml

@@ -2,50 +2,50 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iotechn.unimall.data.mapper.tools.gen.GenTableMapper">
 
-	<resultMap type="GenTable" id="GenTableResult">
-		<id     property="tableId"        column="table_id"        />
-		<result property="tableName"      column="table_name"      />
-		<result property="tableComment"   column="table_comment"   />
-		<result property="className"      column="class_name"      />
-		<result property="tplCategory"    column="tpl_category"    />
-		<result property="packageName"    column="package_name"    />
-		<result property="moduleName"     column="module_name"     />
-		<result property="businessName"   column="business_name"   />
-		<result property="functionName"   column="function_name"   />
-		<result property="functionAuthor" column="function_author" />
-		<result property="options"        column="options"         />
-		<result property="createBy"       column="create_by"       />
-		<result property="createTime"     column="create_time"     />
-		<result property="updateBy"       column="update_by"       />
-		<result property="updateTime"     column="update_time"     />
-		<result property="remark"         column="remark"          />
-		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
-	</resultMap>
+<!--	<resultMap type="GenTable" id="GenTableResult">-->
+<!--		<id     property="tableId"        column="table_id"        />-->
+<!--		<result property="tableName"      column="table_name"      />-->
+<!--		<result property="tableComment"   column="table_comment"   />-->
+<!--		<result property="className"      column="class_name"      />-->
+<!--		<result property="tplCategory"    column="tpl_category"    />-->
+<!--		<result property="packageName"    column="package_name"    />-->
+<!--		<result property="moduleName"     column="module_name"     />-->
+<!--		<result property="businessName"   column="business_name"   />-->
+<!--		<result property="functionName"   column="function_name"   />-->
+<!--		<result property="functionAuthor" column="function_author" />-->
+<!--		<result property="options"        column="options"         />-->
+<!--		<result property="createBy"       column="create_by"       />-->
+<!--		<result property="createTime"     column="create_time"     />-->
+<!--		<result property="updateBy"       column="update_by"       />-->
+<!--		<result property="updateTime"     column="update_time"     />-->
+<!--		<result property="remark"         column="remark"          />-->
+<!--		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />-->
+<!--	</resultMap>-->
 
-	<resultMap type="GenTableColumn" id="GenTableColumnResult">
-		<id     property="columnId"       column="column_id"      />
-		<result property="tableId"        column="table_id"       />
-		<result property="columnName"     column="column_name"    />
-		<result property="columnComment"  column="column_comment" />
-		<result property="columnType"     column="column_type"    />
-		<result property="javaType"       column="java_type"      />
-		<result property="javaField"      column="java_field"     />
-		<result property="isPk"           column="is_pk"          />
-		<result property="isIncrement"    column="is_increment"   />
-		<result property="isRequired"     column="is_required"    />
-		<result property="isInsert"       column="is_insert"      />
-		<result property="isEdit"         column="is_edit"        />
-		<result property="isList"         column="is_list"        />
-		<result property="isQuery"        column="is_query"       />
-		<result property="queryType"      column="query_type"     />
-		<result property="htmlType"       column="html_type"      />
-		<result property="dictType"       column="dict_type"      />
-		<result property="sort"           column="sort"           />
-		<result property="createBy"       column="create_by"      />
-		<result property="createTime"     column="create_time"    />
-		<result property="updateBy"       column="update_by"      />
-		<result property="updateTime"     column="update_time"    />
-	</resultMap>
+<!--	<resultMap type="GenTableColumn" id="GenTableColumnResult">-->
+<!--		<id     property="columnId"       column="column_id"      />-->
+<!--		<result property="tableId"        column="table_id"       />-->
+<!--		<result property="columnName"     column="column_name"    />-->
+<!--		<result property="columnComment"  column="column_comment" />-->
+<!--		<result property="columnType"     column="column_type"    />-->
+<!--		<result property="javaType"       column="java_type"      />-->
+<!--		<result property="javaField"      column="java_field"     />-->
+<!--		<result property="isPk"           column="is_pk"          />-->
+<!--		<result property="isIncrement"    column="is_increment"   />-->
+<!--		<result property="isRequired"     column="is_required"    />-->
+<!--		<result property="isInsert"       column="is_insert"      />-->
+<!--		<result property="isEdit"         column="is_edit"        />-->
+<!--		<result property="isList"         column="is_list"        />-->
+<!--		<result property="isQuery"        column="is_query"       />-->
+<!--		<result property="queryType"      column="query_type"     />-->
+<!--		<result property="htmlType"       column="html_type"      />-->
+<!--		<result property="dictType"       column="dict_type"      />-->
+<!--		<result property="sort"           column="sort"           />-->
+<!--		<result property="createBy"       column="create_by"      />-->
+<!--		<result property="createTime"     column="create_time"    />-->
+<!--		<result property="updateBy"       column="update_by"      />-->
+<!--		<result property="updateTime"     column="update_time"    />-->
+<!--	</resultMap>-->
 	<sql id="selectDictTypeVo">
 		SELECT
 			table_id AS tableId,
@@ -84,7 +84,7 @@
 			#{item}
 		</foreach>
 	</select>
-	<select id="selectDbTableList" parameterType="GenTable" resultType="com.iotechn.unimall.data.domain.tools.gen.GenTable">
+	<select id="selectDbTableList"  resultType="com.iotechn.unimall.data.domain.tools.gen.GenTable">
 		SELECT
 		table_name as tableName,
 		table_comment as tableComment,
@@ -104,7 +104,7 @@
 			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
 		</if>
 	</select>
-	<select id="selectDbTableCount" parameterType="GenTable" resultType="java.lang.Integer">
+	<select id="selectDbTableCount"  resultType="java.lang.Integer">
 		SELECT
 		COUNT(*)
 		FROM

unimall-launcher/pom.xml

@@ -1,7 +1,7 @@
 <?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">
+		 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.iotechn</groupId>
@@ -21,11 +21,6 @@
 
 	<dependencies>
 
-		<dependency>
-			<groupId>com.iotechn</groupId>
-			<artifactId>unimall-app-api</artifactId>
-			<version>0.0.1-RELEASE</version>
-		</dependency>
 
 		<dependency>
 			<groupId>com.iotechn</groupId>