Browse Source

bug修复

huianan 2 years ago
parent
commit
ad734d2586

+ 2 - 2
ruoyi-admin/pom.xml

@@ -41,8 +41,8 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-<!--            <version>8.0.20</version>-->
-            <version>5.1.49</version>
+            <version>8.0.20</version>
+<!--            <version>5.1.49</version>-->
         </dependency>
 
         <!-- 核心模块-->

+ 0 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/post/PostBulletinController.java

@@ -6,11 +6,9 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.post.domain.PostBulletin;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;

+ 5 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/post/PostSeriesController.java

@@ -126,12 +126,14 @@ public class PostSeriesController extends BaseController {
      */
     @ApiOperation("套系上链")
     @PreAuthorize("@ss.hasPermi('system:series:list')")
-    @PutMapping("/onchain/{seriesId}")
-    public AjaxResult OnChain(@PathVariable("seriesId") Long seriesId, PostSeries postSeries) {
+    @PutMapping("/onchain")
+    public AjaxResult OnChain(@RequestBody int seriesId) {
+        long lseriesId=seriesId;
+        PostSeries postSeries = postSeriesService.selectPostSeriesBySeriesId(lseriesId);
+        System.out.println(postSeries);
         if (postSeries.getExchangeFlag().equals('0')) {
             return AjaxResult.error("不可重复上链");
         }
-        postSeries = postSeriesService.selectPostSeriesBySeriesId(seriesId);
         return toAjax(postSeriesService.OnChain(postSeries));
     }
 

+ 7 - 7
ruoyi-admin/src/main/resources/application-druid.yml

@@ -2,16 +2,16 @@
 spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.jdbc.Driver
+        driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
             master:
-#                url: jdbc:mysql://39.105.160.25:10992/red?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: post
-#                password: post
-                url: jdbc:mysql://localhost:3306/post?useUnicode=true&characterEncoding=utf8
-                username: root
-                password: huianan
+                url: jdbc:mysql://39.105.160.25:10992/red?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: post
+                password: post
+#                url: jdbc:mysql://localhost:3306/post?useUnicode=true&characterEncoding=utf8
+#                username: root
+#                password: huianan
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

+ 1 - 1
ruoyi-post/src/main/java/com/ruoyi/post/service/IPostSeriesService.java

@@ -17,7 +17,7 @@ public interface IPostSeriesService
      * @param seriesId 邮贝套系信息; 主键
      * @return 邮贝套系信息; 
      */
-    public PostSeries selectPostSeriesBySeriesId(Long seriesId);
+    public PostSeries selectPostSeriesBySeriesId(long seriesId);
 
     /**
      * 查询邮贝套系信息; 列表

+ 1 - 1
ruoyi-post/src/main/java/com/ruoyi/post/service/impl/PostSeriesServiceImpl.java

@@ -30,7 +30,7 @@ public class PostSeriesServiceImpl implements IPostSeriesService
      * @return 邮贝套系信息; 
      */
     @Override
-    public PostSeries selectPostSeriesBySeriesId(Long seriesId)
+    public PostSeries selectPostSeriesBySeriesId(long seriesId)
     {
         return postSeriesMapper.selectPostSeriesBySeriesId(seriesId);
     }

+ 0 - 1
ruoyi-post/src/main/resources/mapper/PostSeriesMapper.xml

@@ -8,7 +8,6 @@
         <result property="seriesId" column="series_id"/>
         <result property="seriesName" column="series_name"/>
         <result property="seriesImage" column="series_image"/>
-
         <result property="collectionCounts" column="collection_counts"/>
         <result property="status" column="status"/>
         <result property="exchangeStatus" column="exchange_status"/>