Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx-06-15-live

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/AppVersionInfoBak.java

@@ -0,0 +1,46 @@
+package com.ym.mec.biz.dal.entity;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(app_version_info):
+ */
+@Data
+public class AppVersionInfoBak {
+
+	private Integer id;
+
+	/** 平台（andorid/ios） */
+	private String platform;
+
+	/** 版本号（以V开头） */
+	private String version;
+
+	/** 状态（newest/history） */
+	private String status;
+
+	/** 是否强制更新 */
+	private boolean isForceUpdate;
+
+	/** 更新描述 */
+	private String description;
+
+	/** 下载地址 */
+	private String downloadUrl;
+
+	/** 创建人 */
+	private Integer operatorId;
+
+	/**  */
+	private java.util.Date updateTime;
+
+	/**  */
+	private java.util.Date createTime;
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-web/src/main/java/com/ym/mec/web/controller/AppVersionInfoController.java

@@ -1,5 +1,7 @@
 package com.ym.mec.web.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.ym.mec.biz.dal.entity.AppVersionInfoBak;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -42,6 +44,12 @@ public class AppVersionInfoController extends BaseController {
 	public Object queryByPlatform(String platform) {
 		List<AppVersionInfo> list = appVersionInfoService.queryNewestByPlatform(platform);
 		if (list.size() > 0) {
+			AppVersionInfo appVersionInfo = list.get(0);
+			if(appVersionInfo.getVersion().equals("2.0.9") && appVersionInfo.getPlatform().equals("android-education")){
+				AppVersionInfoBak appVersionInfoBak = JSONObject.parseObject(JSONObject.toJSONString(appVersionInfo),AppVersionInfoBak.class);
+				appVersionInfoBak.setDownloadUrl(new String(appVersionInfo.getDownloadUrl()));
+				return succeed(appVersionInfoBak);
+			}
 			return succeed(list.get(0));
 		}
 		return failed();

mec-web/src/main/resources/bootstrap-local.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=43.137.4.92:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=fcc00e52-a464-4ab8-96aa-3469b3f66062
+spring.cloud.nacos.config.namespace=d0699206-ca95-4404-a20d-420864a8029f
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}