wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
wangliwen 2022-06-02 17:43:38 +08:00
parent 834150846a e2801315c6
commit 4534c3d090
5 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
renren-admin/src/main/java/io/renren/AdminApplication.java
View File

@ -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

2
renren-admin/src/main/java/io/renren/modules/monitor/controller/FordController.java
View File

@ -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);

1
renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java
View File

@ -115,7 +115,6 @@ public class ResourceEntity extends BaseEntity {
*/
private String note5;
/**
* 附件
*/

1
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -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;

3
renren-admin/src/main/java/io/renren/modules/taskList/controller/ShangTangController.java
View File

@ -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!");