Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin/pom.xml

@@ -203,6 +203,12 @@
             <version>2.0-rscp-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+            <optional>true</optional>
+            <version>2.8.3</version>
+        </dependency>
     </dependencies>
     <build>
         <finalName>ace-admin</finalName>

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java

@@ -25,7 +25,8 @@ import tk.mybatis.spring.annotation.MapperScan;
 @EnableCircuitBreaker
 @SpringBootApplication(scanBasePackages = {
         "com.github.wxiaoqi.security.common.log",
-        "com.github.wxiaoqi.security.admin"
+        "com.github.wxiaoqi.security.admin",
+        "com.upyuns.platform.rs.gtdata",
 })
 @EnableFeignClients(value = {"com.github.wxiaoqi.security","com.upyuns.platform.rs"},defaultConfiguration = HeaderConfig.class)
 @EnableScheduling

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/backstage/BgGtdataController.java

@@ -39,7 +39,7 @@ public class BgGtdataController extends CommonBaseController {
             @RequestParam("file") MultipartFile file,
             @RequestParam(value = "prefix",defaultValue = "admin")String prefix
     )throws Exception {
-        return uploads2(file, prefix);
+        return uploads(file, prefix);
     }
 
     @RequestMapping(value = "/app/unauth/upload", method = RequestMethod.POST)

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/CompanyInfo.java

@@ -101,4 +101,10 @@ public class CompanyInfo implements Serializable {
 	@ApiModelProperty(value = "更新时间", hidden = true )
 	private Date updTime;
 
+	/**
+	 *  底部图片 逗号分隔
+	 */
+	@Column(name = "bottom_imgs")
+	@ApiModelProperty(value = "底部图片 逗号分隔", hidden = true )
+	private String bottomImgs;
 }

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/job/WebsiteScheduleTask.java

@@ -30,7 +30,7 @@ import static com.upyuns.platform.rs.website.entity.OrderInfo.SENDTYPE_OL;
 import static com.upyuns.platform.rs.website.type.OrderStatusEnum.ORDER_PAID;
 import static com.upyuns.platform.rs.website.type.OrderStatusEnum.ORDER_SEND;
 
-@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+//@Configuration      //1.主要用于标记配置类，兼备Component的效果。
 @EnableScheduling   // 2.开启定时任务
 @Slf4j
 public class WebsiteScheduleTask {
@@ -59,7 +59,7 @@ public class WebsiteScheduleTask {
 
 
     //3.添加定时任务
-    //@Scheduled(cron = "0/5 * * * * ?")
+    @Scheduled(cron = "0/5 * * * * ?")
     //或直接指定时间间隔，例如：5秒
     //@Scheduled(fixedRate=5000)
     public void configureTasks() {