Merge branch 'fix/delete_huawei' into 'develop'

删除华为推送

See merge request o2oa/o2oa!1249

o2web/source/x_component_systemconfig/public/lp/en.js

@@ -1369,7 +1369,6 @@ o2.xApplication.systemconfig.LP = {
         "pushTypeInfo": "O2OA支持极光推送服务和华为推送服务，您可以根据需要选择推送服务",
         "pushTypeData": [
             {"value": "jpush", "label": "jpush", "text": "极光推送服务"},
-            {"value": "huawei", "label": "huawei", "text": "华为推送服务"},
             {"value": "none", "label": "none", "text": "禁用消息推送"}
         ],
 

o2web/source/x_component_systemconfig/public/lp/zh-cn.js

@@ -1377,7 +1377,6 @@ o2.xApplication.systemconfig.LP = {
         "pushTypeInfo": "O2OA支持极光推送服务和华为推送服务，您可以根据需要选择推送服务",
         "pushTypeData": [
             {"value": "jpush", "label": "jpush", "text": "极光推送服务"},
-            {"value": "huawei", "label": "huawei", "text": "华为推送服务"},
             {"value": "none", "label": "none", "text": "禁用消息推送"}
         ],
 

o2web/source/x_component_systemconfig/src/components/content/MobilePushConfig.vue

@@ -28,27 +28,6 @@
 
       </div>
 
-      <div v-if="confgiData.pushType==='huawei'">
-
-        <BaseItem
-            :title="lp._pushConfig.appId"
-            :info="lp._pushConfig.appIdInfo"
-            :config="confgiData.huawei.appId"
-            :allowEditor="true"
-            @changeConfig="(value)=>{confgiData.huawei.appId = value; saveData()}"
-        ></BaseItem>
-
-        <BaseItem
-            :title="lp._pushConfig.appSecret"
-            :info="lp._pushConfig.appSecretInfo"
-            :config="confgiData.huawei.appSecret"
-            :allowEditor="true"
-            @changeConfig="(value)=>{confgiData.huawei.appSecret = value; saveData()}"
-        ></BaseItem>
-
-      </div>
-
-
     </div>
 
   </div>
@@ -70,26 +49,17 @@ const saveData = async () => {
   const d = {
     enable: confgiData.value.pushType==='jpush',
     appKey: confgiData.value.jpush.appKey,
-    masterSecret: confgiData.value.jpush.masterSecret,
-    huaweiPushEnable: (confgiData.value.pushType==='huawei'),
-    huaweiPushConfig: {
-      appId: confgiData.value.huawei.appId,
-      appSecret: confgiData.value.huawei.appSecret,
-    }
+    masterSecret: confgiData.value.jpush.masterSecret
   }
   await saveConfigData('jpushConfig', d);
 }
 
 getConfigData('jpushConfig').then((data)=>{
   confgiData.value = {
-    pushType: (data.enable) ? 'jpush' : ((data.huaweiPushEnable) ? 'huawei': 'none'),
+    pushType: (data.enable) ? 'jpush' :  'none',
     jpush: {
       appKey: data.appKey,
       masterSecret: data.masterSecret
-    },
-    huawei:{
-      appId: data.huaweiPushConfig.appId,
-      appSecret: data.huaweiPushConfig.appSecret
     }
   };
 });

o2web/source/x_component_systemconfig/src/util/config.json

@@ -35,10 +35,6 @@
     "file": "externalStorageSources.json",
     "description": "文件存储配置"
   },
-  "huaweiPushConfig": {
-    "file": "huaweiPushConfig.json",
-    "description": "华为推送配置"
-  },
   "jpushConfig": {
     "file": "jpushConfig.json",
     "description": "极光推送配置"