Merge branch 'dev_youhua' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_youhua

# Conflicts:
#	esua-epdc/epdc-admin/epdc-admin-server/pom.xml

esua-epdc/epdc-admin/epdc-admin-server/pom.xml

@@ -159,12 +159,11 @@
                 <!--小程序配置-->
 <!--                <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>-->
 <!--                <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>-->
-
                 <wx.ma.appId>wx5d3e97461d248397</wx.ma.appId>
                 <wx.ma.secret>bfed51b731e53db9affb9e6131e7ae12</wx.ma.secret>
                 <!--工作端小程序-->
-                <work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
+                <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
-                <work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
+                <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
             </properties>
         </profile>
         <profile>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @email yujintao@elink-cn.com
  * @date 2019/9/5 19:20
  */
-@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class,url = "http://127.0.0.1:9064")
+@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class)
 public interface NewsFeignClient {
 
     /**

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -25,7 +25,7 @@ import java.util.List;
  * @email yujintao@elink-cn.com
  * @date 2019/9/7 9:27
  */
-@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class,url = "http://localhost:9068")
+@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class)
 public interface UserFeignClient {
 
     /**

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/HeartFeignClient.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @Author：wanggongfeng
  * @Date：2019/12/16 17:36
  */
-@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = HeartFeignClientFallback.class,url = "http://127.0.0.1:9060")
+@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = HeartFeignClientFallback.class)
 public interface HeartFeignClient {
 
     /**

esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -19,7 +19,7 @@ import java.util.List;
  * @Author：wanggongfeng
  * @Date：2019/12/16 17:36
  */
-@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class,url = "http://127.0.0.1:9068")
+@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class)
 public interface UserFeignClient {
 
     /**

esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml

@@ -226,8 +226,10 @@
                 <wx.mp.configs.token>111</wx.mp.configs.token>
                 <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
                 <!--小程序配置-->
-                <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
+<!--                <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>-->
-                <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
+<!--                <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>-->
+                <wx.ma.appId>wx5d3e97461d248397</wx.ma.appId>
+                <wx.ma.secret>bfed51b731e53db9affb9e6131e7ae12</wx.ma.secret>
             </properties>
         </profile>
     </profiles>