From 7bc4a94b80066faeab76d546a517d304f9410eef Mon Sep 17 00:00:00 2001
From: lzh <liuzhanhong>
Date: Wed, 5 Apr 2023 21:27:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=8C=89sort=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mallplus-admin/pom.xml                                |  4 ++--
 .../src/main/resources/application-dev.properties     |  8 ++++----
 mallplus-mbg/pom.xml                                  | 11 +++++++----
 mallplus-portal/pom.xml                               |  2 +-
 .../com/zscat/mallplus/single/SingePmsController.java |  3 ++-
 .../pms/product/components/ProductInfoDetail.vue      |  4 ++--
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/mallplus-admin/pom.xml b/mallplus-admin/pom.xml
index 3d8e5ac..cf53347 100644
--- a/mallplus-admin/pom.xml
+++ b/mallplus-admin/pom.xml
@@ -62,11 +62,11 @@
             <artifactId>gecco</artifactId>
             <version>1.0.8</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
+        <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson  <version>1.2.59</version>  -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.59</version>
+            <version>1.2.62</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/mallplus-admin/src/main/resources/application-dev.properties b/mallplus-admin/src/main/resources/application-dev.properties
index 225d647..7f32296 100644
--- a/mallplus-admin/src/main/resources/application-dev.properties
+++ b/mallplus-admin/src/main/resources/application-dev.properties
@@ -18,11 +18,11 @@ spring.redis.pool.min-idle=0
 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
 spring.redis.timeout=0
 #===redis end===
-#spring.datasource.url=jdbc:mysql://8.130.39.13:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://8.130.39.13:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
 spring.datasource.username=root
-spring.datasource.password=root
-#spring.datasource.password=1LAiGz$t1*Iw
+#spring.datasource.password=root
+spring.datasource.password=1LAiGz$t1*Iw
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.druid.initialSize=5
diff --git a/mallplus-mbg/pom.xml b/mallplus-mbg/pom.xml
index 8a4e7de..0f55de4 100644
--- a/mallplus-mbg/pom.xml
+++ b/mallplus-mbg/pom.xml
@@ -18,7 +18,8 @@
         <mybatis-plus-boot-starter.version>3.0-RC3</mybatis-plus-boot-starter.version>
         <HikariCP.version>3.2.0</HikariCP.version>
         <alipay.version>3.1.0</alipay.version>
-        <hutool.version>[4.1.12,)</hutool.version>
+<!--        <hutool.version>[4.1.12,)</hutool.version>-->
+        <hutool.version>5.0.4</hutool.version>
         <qiniu.version>[7.2.0, 7.2.99]</qiniu.version>
         <mail.version>1.4.7</mail.version>
         <oshi.version>3.9.1</oshi.version>
@@ -113,12 +114,12 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
-            <version>2.6.1</version>
+            <version>2.7.0</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.6.1</version>
+            <version>2.7.0</version>
         </dependency>
         <!-- 阿里短信接口 -->
         <dependency>
@@ -142,10 +143,12 @@
             <version>3.2.1</version>
             <scope>compile</scope>
         </dependency>
+
+        <!--            <version>4.0.0</version>-->
         <dependency>
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-annotation</artifactId>
-            <version>4.0.0</version>
+            <version>3.2.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/mallplus-portal/pom.xml b/mallplus-portal/pom.xml
index 1b5a753..af4b03e 100644
--- a/mallplus-portal/pom.xml
+++ b/mallplus-portal/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.60</version>
+            <version>1.2.62</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java
index 3c46ec2..7105811 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java
@@ -385,7 +385,8 @@ public class SingePmsController extends ApiBaseAction {
         if (ValidatorUtils.notEmpty(schoolId) && schoolId > 0) {
             product.setSchoolId(schoolId);
         }
-        String orderColum = "create_time";
+        // String orderColum = "create_time";
+        String orderColum = "sort";
         if (ValidatorUtils.notEmpty(product.getSort())) {
             if (product.getSort() == 1) {
                 orderColum = "sale";
diff --git a/mallplusui-web-admin/src/views/pms/product/components/ProductInfoDetail.vue b/mallplusui-web-admin/src/views/pms/product/components/ProductInfoDetail.vue
index 0cf6746..83bc00b 100644
--- a/mallplusui-web-admin/src/views/pms/product/components/ProductInfoDetail.vue
+++ b/mallplusui-web-admin/src/views/pms/product/components/ProductInfoDetail.vue
@@ -119,9 +119,9 @@
       </el-select>
       </el-form-item> -->
 
-<!--      <el-form-item label="排序">
+      <el-form-item label="排序">
         <el-input v-model="value.sort"></el-input>
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item style="text-align: center">
         <el-button type="primary" size="medium" @click="handleNext('productInfoForm')">下一步</el-button>
       </el-form-item>