Merge branch 'test' of http://git.mokasz.com/marketing/moka-private into test

# Conflicts:
#	src/main/resources/application-test.properties

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxMobilePoolController.java

@@ -154,7 +154,7 @@ public class FosterwxMobilePoolController extends BaseController<FosterwxMobileP
         JSONObject result = restTemplate.exchange(domain + "/poster/qrcode", HttpMethod.POST, httpEntity, JSONObject.class).getBody();
 
         if (null != result) {
-            if ("200".equals(result.get("code"))) {
+            if ("200".equals(result.get("code").toString())) {
                 return AjaxResult.success(result.get("data").toString());
             } else {
                 return AjaxResult.error(result.get("data").toString());

src/main/resources/application-prod.properties

@@ -76,7 +76,7 @@ es.password=moka6_3moka
 es.port=9200
 
 #typer接口
-typer.url=https://typer.mokamrp.com
+typer.url=http://new-typer-combine-svc/api
 
 #定时任务全局开关，线上环境需要开启
-cronjob.power=true
+cronjob.power=true

src/main/resources/application-test.properties

@@ -75,7 +75,7 @@ es.username=elastic
 es.password=moka6_3moka
 es.port=9200
 #typer接口
-typer.url=https://test.typer.mokamrp.com/api
+typer.url=http://new-typer-combine-svc/api
 #定时任务全局开关，线上环境需要开启
 cronjob.power=false