Merge branch 'feature/自建应用验证' into 'master'

Feature/自建应用验证

See merge request !1217

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseDTO.java

@@ -109,7 +109,16 @@ public class WxEnterpriseDTO implements Serializable {
     private String wxCorpid ;
     private String openCorpid ;
     private String wxaAppid ;
+    private String urlHost ;
     
+    public String getUrlHost() {
+        return urlHost;
+    }
+
+    public void setUrlHost(String urlHost) {
+        this.urlHost = urlHost;
+    }
+
     public String getWxaAppid() {
         return wxaAppid;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseServiceImpl.java

@@ -111,9 +111,11 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
             qw.setThirdCorpid(wxEnterprise.getWxCorpid());
             qw.setMemberCorpid(wxEnterprise.getWxCorpid());
             TabSecretSetting secret = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.SELF_APP.getVal(), null);
-            qw.setSelfSecret(secret.getSecretVal());
-            qw.setAgentId(secret.getAgentId());
-            qw.setAgentName(secret.getAgentName());
+            if(null != secret) {
+                qw.setSelfSecret(secret.getSecretVal());
+                qw.setAgentId(secret.getAgentId());
+                qw.setAgentName(secret.getAgentName());
+            }
             qw.setSelfAppid(wxEnterprise.getWxaAppid());
         }
         qw.setHbWxaAppid(this.getHbAppid(qw, config.getAppid()));

haoban-manage3-service/src/main/resources/mapper/WxEnterpriseMapper.xml

@@ -65,7 +65,7 @@
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_wx_enterprise
-        where wxa_appid = #{appid} and wx_security_type = 5
+        where wxa_appid = #{appid} and wx_security_type = 5 and status_flag = 1
     </select>
  
     <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise">

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -209,7 +209,7 @@ public class WxEnterpriseController extends WebBaseController {
             desc =  "（第三方明文，代开密文）" ;
         }
         if(wxType==5) {
-            desc = " （自建） " ;
+            desc = " （自建 "+wxEnterpriseDTO.getWxaAppid() +"/" + wxEnterpriseDTO.getUrlHost()+"） " ;
         }
         int newType = this.wxEnterpriseApiService.calcSecretType(wxEnterpriseId) ;
         String diff = "";