Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

src/main/java/com/yunzhi/marketing/controller/MiniAppController.java

         map.put("openId", person.getMiniOpenid());
         map.put("orgId", person.getOrgId());
         map.put("personId", person.getPersonId());
-        miniResp.put("token", JWTUtils.newTokenByMap(map));
+        String token = JWTUtils.newTokenByMap(map);
+        miniResp.put("token", token);
+        sysTokenService.saveToken(token);
+
+        Map<String, Object> extraInfo = new HashMap<>();
+        TdCity tdCity = iTdCityService.getLocationCity(null, person.getOrgId(), null);
 
         Map<String, Object> result = new HashMap<>();
         result.put("miniApp", miniResp);
         result.put("person", person);
+        result.put("extraInfo", extraInfo);
+        result.put("city", tdCity);
 
         return ResponseBean.success(result);
     }

src/main/resources/application-prod.yml

 
 # 企业微信
 workwx:
-  corpid: wwf5f7889b49bb2510
+  corpid: ww5d25337525b92d79
   agentid: 3010097
-  secret: 0zKXGe3lmIoAfedoeLV_6DK96PM-Sg_c79rHqpSlvDs
+  secret: Pfh7UEIn8QEbFlaU5Z_9aPDYHzHlFJJ9rzdm385my28