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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserVo.java

@@ -101,4 +101,6 @@ public class AppUserVo {
 	private String memberName;
 
 	private String password;
+
+	private String gtdataPass;
 }

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -35,12 +35,13 @@
         <result column="state" property="state"/>
         <result column="jobTitle" property="jobTitle"/>
         <result column="memberName" property="memberName"/>
+        <result column="gtdata_pass" property="gtdataPass"/>
     </resultMap>
 
 
     <!--  获取用户信息 -->
     <select id="getUserInfo" resultMap="AppUserVoMap">
-    select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*  from app_user_login l
+    select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,l.gtdata_pass,d.*  from app_user_login l
     left join  app_user_detail d
     on d.userid = l.id
      where d.userid = #{userId}  limit 1

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

@@ -49,7 +49,14 @@ public class GtdataController extends CommonBaseController implements UserRestIn
     public void queryAreaInfoByAreaId() throws Exception  {
         String url = request.getRequestURI();
         String fileName = url.substring(url.lastIndexOf("/")+1);
-        String filePath = "/rscloudmart/bg/upload/2021-01-05/1609838996306.png";
+        String filePath = "";
+        if(fileName.lastIndexOf(".png") > 0) {
+            filePath = "/rscloudmart/bg/upload/2021-01-05/1609838996306.png";
+        }else if(fileName.lastIndexOf("98_98") > 0) {
+            filePath = "/rscloudmart/bg/upload/2021-01-07/1609990102713.jpeg";
+        }else {
+            filePath = "/rscloudmart/bg/upload/2021-01-07/1609987144037.jpeg";
+        }
         //String filePath = "https://w173.obtdata.com/image//data/HEM2/2019/11/18/HEM2_20191118235223_0010_L1B_CMOS1/HEM2_20191118235223_0010_L1B_CMOS1_800_800.png?op=OPEN";
         //String filePath = "https://box.bdimg.com/static/fisp_static/common/img/searchbox/logo_news_276_88_1f9876a.png";
 //        String filePath = "/obt/thumbnail/"+ url.substring(url.lastIndexOf("/app/unauth/image/")+18);
@@ -91,7 +98,7 @@ public class GtdataController extends CommonBaseController implements UserRestIn
         String fileName = url.substring(url.lastIndexOf("/web/gtdata/app/unauth/download/")+32);
 
         GdLoginVO gdLoginVO = gtDataRestClient.rsignUserlogin(getAppUser().getUserid()+"", getAppUser().getGtdataPass());
-        return ObjectRestResponse.succ(gtDataRestClient.openUrl(uploadP+ fileName, gdLoginVO.getSign(), gdLoginVO.getTime(), getAppUser().getUserid()+ ""));
+        return ObjectRestResponse.succ(gtDataRestClient.openUrl(fileName, gdLoginVO.getSign(), gdLoginVO.getTime(), getAppUser().getUserid()+ ""));
     }
 
     @RequestMapping(value = "/app/unauth/register", method = RequestMethod.GET)

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 {
@@ -68,6 +68,7 @@ public class WebsiteScheduleTask {
         List<OrderInfo> list = orderInfoBiz.selectByWeekend(w -> {
             w.andEqualTo(OrderInfo::getStatus, ORDER_SEND.getType());
             w.andEqualTo(OrderInfo::getSendType, SENDTYPE_OL);
+//            w.andEqualTo(OrderInfo::getUserId, 656);
             return w;
         });
 
@@ -75,7 +76,7 @@ public class WebsiteScheduleTask {
             String innerOrderPath =  "/order/"+orderInfo.getOrderNo()+ "/";
             String orderPath = "/"+ orderInfo.getUserId()+ innerOrderPath;
             //创建订单文件夹
-            gtDataRestClient.mkdirOnly("/"+ orderInfo.getUserId()+ "/order/"+orderInfo.getOrderNo());
+            gtDataRestClient.mkdirs("/"+ orderInfo.getUserId()+ "/order/"+orderInfo.getOrderNo());
 
             List<OldeliveryJson> jsons = CollUtil.newArrayList();
             List<OrderItem> items = orderItemBiz.selectList(new OrderItem(){{