From e2801315c659790cc114fb120145af6d79db28f7 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Thu, 2 Jun 2022 17:42:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renren-admin/src/main/java/io/renren/AdminApplication.java | 3 --- .../io/renren/modules/monitor/controller/FordController.java | 2 +- .../io/renren/modules/resource/entity/ResourceEntity.java | 5 ++--- .../modules/resource/service/impl/ResourceServiceImpl.java | 1 - .../modules/taskList/controller/ShangTangController.java | 3 +-- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/AdminApplication.java b/renren-admin/src/main/java/io/renren/AdminApplication.java index 3cdab982..d19483d5 100644 --- a/renren-admin/src/main/java/io/renren/AdminApplication.java +++ b/renren-admin/src/main/java/io/renren/AdminApplication.java @@ -1,12 +1,10 @@ package io.renren; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.cache.annotation.EnableCaching; -import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableScheduling; import springfox.documentation.swagger2.annotations.EnableSwagger2; @@ -27,7 +25,6 @@ public class AdminApplication extends SpringBootServletInitializer { public static void main(String[] args) { SpringApplication.run(AdminApplication.class, args); - System.out.println("项目启动成功"); } @Override diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/controller/FordController.java b/renren-admin/src/main/java/io/renren/modules/monitor/controller/FordController.java index ec8fd297..5257638f 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/controller/FordController.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/controller/FordController.java @@ -25,7 +25,7 @@ public class FordController { String uri = request.getRequestURI(); String fordUrl = imageDomain + uri; - URLConnection con = null; + URLConnection con; try { URL url = new URL(fordUrl); diff --git a/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java b/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java index 6abc7885..47403a58 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java @@ -115,7 +115,6 @@ public class ResourceEntity extends BaseEntity { */ private String note5; - /** * 附件 */ @@ -124,11 +123,11 @@ public class ResourceEntity extends BaseEntity { /** * 下架理由 */ -// private String undercarriageReason; + private String undercarriageReason; /** * 提起下架人员 */ -// private String undercarriageUserName; + private String undercarriageUserName; } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 8eee9a64..f81f7ac6 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -23,7 +23,6 @@ import io.renren.modules.resourceCar.dao.ResourceCarDao; import io.renren.modules.resourceCollection.dao.ResourceCollectionDao; import io.renren.modules.resourceScore.dao.ResourceScoreDao; import io.renren.modules.security.user.SecurityUser; -import io.renren.modules.security.user.UserDetail; import io.renren.modules.sys.dao.SysDeptDao; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/renren-admin/src/main/java/io/renren/modules/taskList/controller/ShangTangController.java b/renren-admin/src/main/java/io/renren/modules/taskList/controller/ShangTangController.java index eb581224..023ea929 100644 --- a/renren-admin/src/main/java/io/renren/modules/taskList/controller/ShangTangController.java +++ b/renren-admin/src/main/java/io/renren/modules/taskList/controller/ShangTangController.java @@ -8,7 +8,6 @@ import io.renren.modules.taskList.service.ShangTangService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.log4j.Log4j2; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -46,7 +45,7 @@ public class ShangTangController { */ @RequestMapping("insertTaskList") @ApiOperation("场景任务列表插入") - @Scheduled(cron = "0 */1 * * * ?") + //@Scheduled(cron = "0 */1 * * * ?") @Transactional public void insertTaskList() { log.info("insertTaskList!");