修改代码

ace-common/src/main/java/com/upyuns/platform/rs/gtdata/GdLoginVO.java

+package com.upyuns.platform.rs.gtdata;
+
+import lombok.Data;
+
+@Data
+public class GdLoginVO {
+    private String time;
+    private String sign;
+}

ace-common/src/main/java/com/upyuns/platform/rs/gtdata/GtDataRestClient.java

@@ -139,7 +139,7 @@ public class GtDataRestClient {
 	 *
 	 */
 	public Map<String, Object> getToken() {
-		return getToken(gtDataUsername);
+		return getToken(gtDataUsername, "");
 	}
 
 	/**
@@ -150,9 +150,14 @@ public class GtDataRestClient {
 	 * @return
 	 *
 	 */
-	public Map<String, Object> getToken(String username) {
-		String resourceUrl = MessageFormat.format("{0}?op=GETTOKEN&user={1}",
-				baseUrl, username);
+	public Map<String, Object> getToken(String username, String rsign) {
+		if(StrUtil.isNotBlank(rsign)){
+			rsign = "&rsign="+ rsign;
+		}else {
+			rsign = "";
+		}
+		String resourceUrl = MessageFormat.format("{0}?op=GETTOKEN&user={1}{2}",
+				baseUrl, username, rsign);
 		return restGet(resourceUrl);
 	}
 
@@ -166,7 +171,7 @@ public class GtDataRestClient {
 	 *
 	 */
 	public Map<String, Object> login(String token, String time) {
-		return login(gtDataUsername, gtDataPassword, token, time);
+		return login(gtDataUsername, gtDataPassword, token, time, "");
 	}
 
 	/**
@@ -181,15 +186,20 @@ public class GtDataRestClient {
 	 *
 	 */
 	public Map<String, Object> login(String username, String password,
-			String token, String time) {
+			String token, String time, String rsign) {
 		String resourceUrl = "";
+		if(StrUtil.isNotBlank(rsign)){
+			rsign = "&rsign="+ rsign;
+		}else {
+			rsign = "";
+		}
 		try {
 			resourceUrl = MessageFormat.format(
-					"{0}?op=LOGIN&user={1}&pass={2}&token={3}&time={4}&",
+					"{0}?op=LOGIN&user={1}&pass={2}&token={3}&time={4}{5}",
 					baseUrl, username,
 					Encodes.encodeHex(Digests.md5((Encodes.encodeHex(Digests
 							.md5(password.getBytes())) + token).getBytes())),
-					token, time);
+					token, time, rsign);
 		} catch (IOException e) {
 			logger.error("password to md5 error.", e);
 		}
@@ -783,10 +793,15 @@ public class GtDataRestClient {
 	 * @return url
 	 *
 	 */
-	public String openUrl(String path) {
+	public String openUrl(String path, String sign, String time, String rsign) {
+		if(StrUtil.isNotBlank(rsign)){
+			rsign = "&rsign="+ rsign;
+		}else {
+			rsign = "";
+		}
 		String resourceUrl = MessageFormat
-				.format("{0}{1}?op=OPEN&sign={2}&time={3}", gtDataUrl, path,
-						defaultSign, defaultTime);
+				.format("{0}{1}?op=OPEN&sign={2}&time={3}{4}", gtDataUrl, path,
+						sign, time, rsign);
 		return resourceUrl;
 	}
 
@@ -1632,21 +1647,23 @@ public class GtDataRestClient {
 	 * Description： 子用户登陆并更新认证信息
 	 *
 	 */
-	protected void sonUserlogin() throws GtDataRestException {
-		Map<String, Object> tokenMap = getToken();
-		defaultToken = (String) tokenMap.get("token");
-		defaultTime = (String) tokenMap.get("time");
+	public GdLoginVO rsignUserlogin(String user, String pass) throws GtDataRestException {
+		Map<String, Object> tokenMap = getToken(user, user);
+		String userToken = (String) tokenMap.get("token");
+		String userTime = (String) tokenMap.get("time");
 		if (200 != (Integer) tokenMap.get("HttpStatusCode")) {
 			throw new GtDataRestException((String) tokenMap.get("errorCode"));
 		}
 
-		Map<String, Object> loginMap = login(defaultToken, defaultTime);
-		defaultTime = (String) loginMap.get("time");
-		defaultSign = (String) loginMap.get("sign");
+		Map<String, Object> loginMap = login(user, pass, userToken, userTime, user);
+		GdLoginVO gdLoginVO = new GdLoginVO(){{
+			setTime((String) loginMap.get("time"));
+			setSign((String) loginMap.get("sign"));
+		}};
 		if (200 != (Integer) loginMap.get("HttpStatusCode")) {
 			throw new GtDataRestException((String) loginMap.get("errorCode"));
 		}
-
+		return gdLoginVO;
 	}
 
 	/**

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserLogin.java

@@ -47,7 +47,7 @@ public class AppUserLogin {
 	private Long lastTime;
 
 	/**
-	 * 最后登录时间
+	 * data密码加密前
 	 */
 	@Column(name = "gtdata_pass")
 	private String gtdataPass;

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -4,6 +4,8 @@ import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+
 /**
  * 用户详情信息表
  */
@@ -106,6 +108,13 @@ public class AppUserDTO {
 	//用户分公司id
 	private Integer  parentCompanyId;
 
+
+	/**
+	 * data密码加密前
+	 */
+	@Column(name = "gtdata_pass")
+	private String gtdataPass;
+
 	public String obtainRealname() {
 		if(StrUtil.isBlank(getRealname())) {
 			return "匿名";

rs-datacenter/rs-datacenter-server/pom.xml

@@ -15,6 +15,12 @@
     <artifactId>rs-datacenter-server</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.wxiaoqi</groupId>
+            <artifactId>ace-admin-api</artifactId>
+            <version>2.0-rscp-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.upyuns.platform.rs</groupId>
             <artifactId>rs-datacenter-api</artifactId>

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

 package com.upyuns.platform.rs.datacenter.rest;
 
 import cn.hutool.core.util.StrUtil;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
+import com.github.wxiaoqi.security.common.util.MD5;
 import com.upyuns.platform.rs.datacenter.entity.RscpAreaInfo;
+import com.upyuns.platform.rs.gtdata.GdLoginVO;
 import com.upyuns.platform.rs.gtdata.GtDataRestClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,10 +30,18 @@ import java.util.Map;
 @RestController
 @Slf4j
 @RequestMapping("/web/gtdata/")
-public class GtdataController extends CommonBaseController {
+public class GtdataController extends CommonBaseController implements UserRestInterface {
     @Autowired
     GtDataRestClient gtDataRestClient;
 
+    @Autowired
+    UserFeign userFeign;
+
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
     public static final String uploadP = "/rscloudmart/bg/upload/";
 
     @RequestMapping(value = "/app/unauth/image/**", method = RequestMethod.GET)
@@ -54,7 +67,18 @@ public class GtdataController extends CommonBaseController {
     public ObjectRestResponse download() throws Exception  {
         String url = request.getRequestURI();
         String fileName = url.substring(url.lastIndexOf("/web/gtdata/app/unauth/download/")+32);
-        return ObjectRestResponse.succ(gtDataRestClient.openUrl(uploadP+ fileName));
+
+        GdLoginVO gdLoginVO = gtDataRestClient.rsignUserlogin(getAppUser().getUserid()+"", getAppUser().getGtdataPass());
+        return ObjectRestResponse.succ(gtDataRestClient.openUrl(uploadP+ fileName, gdLoginVO.getSign(), gdLoginVO.getTime(), getAppUser().getUserid()+ ""));
+    }
+
+    @RequestMapping(value = "/app/unauth/register", method = RequestMethod.GET)
+    @IgnoreUserToken
+    public ObjectRestResponse dataRegister(AppUserLogin appUserLogin) throws Exception  {
+        String gtdataPass = MD5.GetMD5StringLower(appUserLogin.getId().toString());
+        Map<String, Object> result = gtDataRestClient.register(appUserLogin.getId()+"", MD5.GetMD5StringLower(gtdataPass), (1024L* 1024L* 1024L* 100)+ "");
+        result.put("gtdataPass", gtdataPass);
+        return ObjectRestResponse.succ(result);
     }
 
     public void downloadVideoById(String fileName, String filePath, HttpServletResponse response) throws Exception {

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/UserOrderDto.java

@@ -65,4 +65,9 @@ public class UserOrderDto extends PageParam {
 	 * 发票状态： 1、未开发票，2、已开发票, 3、已发货， 4、已收货、5、退回， 6、已完成
 	 */
 	Integer invoiceStatus;
+
+	/**
+	 * 卫星标识
+	 */
+	String satellite;
 }

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

@@ -261,9 +261,15 @@ public class OrderInfo implements Serializable {
 	 */
 	String oldeliveryJson;
 
+	/**
+	 * 卫星标识
+	 */
+	String satellite;
+
 	@Transient
 	private List<OrderItem> orderItemList;
 
 	@Transient
 	OrderEInvoice orderEInvoice;
+
 }

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java

@@ -159,6 +159,9 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		Query query = new Query(userOrderDto);
 		Example example = new Example(OrderInfo.class);
 		Example.Criteria orderInfoCriteria = example.createCriteria();
+		if (userOrderDto.getSatellite() != null) {
+			orderInfoCriteria.andLike("satellite", "%"+userOrderDto.getSatellite() +"%");
+		}
 		if (userOrderDto.getStatus() != null) {
 			orderInfoCriteria.andEqualTo("status", userOrderDto.getStatus());
 		}

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

@@ -28,10 +28,11 @@ import java.util.stream.Collectors;
 
 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的效果。
-//@EnableScheduling   // 2.开启定时任务
-//@Slf4j
+@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+@EnableScheduling   // 2.开启定时任务
+@Slf4j
 public class WebsiteScheduleTask {
 
     @Autowired
@@ -58,14 +59,14 @@ public class WebsiteScheduleTask {
 
 
     //3.添加定时任务
-    @Scheduled(cron = "0/5 * * * * ?")
+    //@Scheduled(cron = "0/5 * * * * ?")
     //或直接指定时间间隔，例如：5秒
     //@Scheduled(fixedRate=5000)
     public void configureTasks() {
         //查询是否有线上并且代发货的订单
         //log.info("执行静态定时任务时间: " + LocalDateTime.now());
         List<OrderInfo> list = orderInfoBiz.selectByWeekend(w -> {
-            w.andEqualTo(OrderInfo::getStatus, ORDER_PAID.getType());
+            w.andEqualTo(OrderInfo::getStatus, ORDER_SEND.getType());
             w.andEqualTo(OrderInfo::getSendType, SENDTYPE_OL);
             return w;
         });