Merge remote-tracking branch 'origin/dev_plugins' into dev_plugins

epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   common-service-server:
     container_name: common-service-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.8
+    image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.9
     ports:
       - "8103:8103"
     network_mode: host # 使用现有网络

epmet-module/epmet-common-service/common-service-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.8</version>
+    <version>0.3.9</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-common-service</artifactId>
@@ -107,7 +107,7 @@
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
-                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
                 <nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.47
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.51
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-point-server:
     container_name: epmet-point-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.38
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.40
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.128
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.130
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.123
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.128
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.128</version>
+    <version>0.0.130</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/AppLetAuthorizationController.java

@@ -31,6 +31,7 @@ public class AppLetAuthorizationController {
     @PostMapping("gotoauth")
     public Result<GoToAuthResultDTO> goToAuth(@LoginUser TokenDto tokenDto, @RequestBody GoToAuthFormDTO formDTO, @RequestHeader("source")String source){
         ValidatorUtils.validateEntity(formDTO);
+
         GoToAuthResultDTO goToAuthResultDTO = appLetAuthorizationService.goToAuth(tokenDto,formDTO,source);
         return new Result().ok(goToAuthResultDTO);
     }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java

@@ -725,8 +725,8 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
             log.error("授权完成发送钉钉消息失败，原因：未查询到客户信息，客户Id->" + customerId);
             return null;
         }
-        String secret = "SEC68536dfc393790a35cb08e9bc531dad0c654cf84bb53b76667fa7a7f2cbed829";
+        String secret = "SEC54dfa7dfa877ea3ea81be14c7a6ae7e2c499b7a148d818d2a68c69f3df08ddfe";
-        String url = "https://oapi.dingtalk.com/robot/send?access_token=c3d34eac31acde342d37a01ac1792beac5b17b2890b4f5015e2759546fed1331";
+        String url = "https://oapi.dingtalk.com/robot/send?access_token=b5b403239205c95930f7291f1c2a8dd838640b22432ccb2dfa0c6d5e47d14892";
         //2.拼接钉钉消息内容并发送
         OapiRobotSendRequest request = new OapiRobotSendRequest();
         request.setMsgtype("markdown");

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java

@@ -254,8 +254,8 @@ public class WarrantServiceImpl implements WarrantService {
         }
         request.setMarkdown(markdown);
         log.info("robot需要发送的内容为："+markdown.getText());
-        String url = "https://oapi.dingtalk.com/robot/send?access_token=2438902efbcc15909deb7076963c5cbe2d6fdbfdb9d66750faab2f2cce6eb09f";
+        String url = "https://oapi.dingtalk.com/robot/send?access_token=b5b403239205c95930f7291f1c2a8dd838640b22432ccb2dfa0c6d5e47d14892";
-        String secret = "SECe3c785dd254659608667a4a623acc5a0395636143411617f6e36838b48941e74";
+        String secret = "SEC54dfa7dfa877ea3ea81be14c7a6ae7e2c499b7a148d818d2a68c69f3df08ddfe";
         HttpClientManager.getInstance().sendDingMsg(JSON.toJSONString(request),url,secret);
     }
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/enums/WxMaErrorMsgEnum.java

@@ -132,6 +132,7 @@ public enum WxMaErrorMsgEnum {
      * </pre>
      */
     CODE_40013(40013, "appid不正确，或者不符合绑定关系要求"),
+    CODE_40014(40014, "不合法的 access_token ，请开发者认真比对 access_token 的有效性（如是否过期），或查看是否正在为恰当的公众号调用接口"),
     /**
      * <pre>
      * template_id 不正确.
@@ -276,6 +277,7 @@ public enum WxMaErrorMsgEnum {
      * </pre>
      */
     CODE_48001(48001, "API 功能未授权"),
+    CODE_48004(48004, "api 接口被封禁，请登录 mp.weixin.qq.com 查看详情"),
     /**
      * <pre>
      * 内容含有违法违规内容.
@@ -304,6 +306,9 @@ public enum WxMaErrorMsgEnum {
      * post 数据为空.
      */
     CODE_44002(44002, "post 数据为空"),
+    CODE_41001(41001, "缺少 access_token 参数"),
+    CODE_43001(43001, "需要 GET 请求"),
+    CODE_43002(43002, "需要 POST 请求"),
     /**
      * post 数据中参数缺失.
      */

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java

@@ -375,7 +375,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 	public WxResult revertCodeRelease(String accessToken) {
 		WxResult result = new WxResult();
 		String url = WxMaCodeConstant.REVERT_CODE_RELEASE_URL + "?" + "access_token=" + accessToken;
-		Result<String> setVersionResult = HttpClientManager.getInstance().sendPostByJSON(url, null);
+		Result<String> setVersionResult = HttpClientManager.getInstance().sendGet(url, null);
 		if (!setVersionResult.success()) {
 			result.setErrorCode(setVersionResult.getCode());
 			result.setErrorMsg(setVersionResult.getMsg());

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml

@@ -42,7 +42,8 @@
     <!-- 修改小程序授权的状态 -->
     <update id="updateAuthorizationFlag">
         UPDATE customer_mp
-            SET authorization_flag = 0
+            SET authorization_flag = 0,
+                app_id = ''
         WHERE
             app_id = #{authAppId}
     </update>

epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.32
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.33
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络

epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.80
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.81
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.40
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.41
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络

epmet-module/gov-project/gov-project-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.40</version>
+    <version>0.3.41</version>
     <parent>
         <artifactId>gov-project</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-customize-server:
     container_name: oper-customize-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.23
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.25
     ports:
       - "8089:8089"
     network_mode: host # 使用现有网络

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.4__add_customer_function_detail.sql

@@ -8,6 +8,7 @@ CREATE TABLE `customer_function_detail` (
   `ICON_SMALL_IMG` varchar(128) NOT NULL COMMENT ''自定义小图标'',
   `DOMAIN_NAME` varchar(32) NOT NULL COMMENT ''自定义业务域名'',
   `TARGET_LINK` varchar(128) NOT NULL COMMENT ''外链地址'',
+  `SHOPPING_STATUS` int(11) NOT NULL COMMENT ''上架状态(0.下架 1.上架)'',
   `DISPLAY_ORDER` int(11) NOT NULL COMMENT ''自定义排序'',
   `DEL_FLAG` int(11) NOT NULL COMMENT ''删除标识(0.未删除 1.已删除)'',
   `REVISION` int(11) NOT NULL COMMENT ''乐观锁'',
@@ -44,3 +45,19 @@ CREATE TABLE function_customized_visited(
     UPDATED_TIME DATETIME NOT NULL   COMMENT '更新时间' ,
     PRIMARY KEY (ID)
 ) COMMENT = '定制功能访问记录表 记录居民端、工作端那些人访问过定制功能以及访问的结果';
+
+
+DROP TABLE IF EXISTS `function_shopping_history`;
+CREATE TABLE function_shopping_history(
+    ID VARCHAR(64) NOT NULL   COMMENT '主键' ,
+    CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户Id' ,
+    FUNCTION_ID VARCHAR(64) NOT NULL   COMMENT '功能Id' ,
+    SHOPPING_STATUS INT NOT NULL   COMMENT '上下架状态 上架状态：0：下架、1：上架' ,
+    REASON VARCHAR(1024) NOT NULL   COMMENT '理由' ,
+    REVISION INT NOT NULL   COMMENT '乐观锁' ,
+    CREATED_BY VARCHAR(32) NOT NULL   COMMENT '创建人' ,
+    CREATED_TIME DATETIME NOT NULL   COMMENT '创建时间' ,
+    UPDATED_BY VARCHAR(32) NOT NULL   COMMENT '更新人' ,
+    UPDATED_TIME DATETIME NOT NULL   COMMENT '更新时间' ,
+    PRIMARY KEY (ID)
+) COMMENT = '客户定制功能上下架历史';

epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.64
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.65
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络

epmet-module/resi-group/resi-group-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.64</version>
+    <version>0.3.65</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>

epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-mine-server:
     container_name: resi-mine-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.33
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.38
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络

epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.116
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.117
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.113
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.116
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.116</version>
+    <version>0.3.117</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>