wenliming 2 éve
szülő
commit
c70cf64dd5
4 módosított fájl, 30 hozzáadás és 14 törlés
  1. 11 8
      log-center/logger.js
  2. 3 3
      pages/treasure/index.vue
  3. 3 3
      pages/treasure/invite.vue
  4. 13 0
      utils/help.js

+ 11 - 8
log-center/logger.js

@@ -1,14 +1,14 @@
 import axios from 'axios';
 import { logType } from './logEnum.js';
-import { getBrowser, getUserInfo, appVersionCode } from '../utils/help';
+import { getBrowser, getUserInfo, appVersionCode, denetExtensionId, detectExtension } from '../utils/help';
 
 const logApi = {
-	prod: 'https://log.weiqumeta.com',
-	pre: 'https://prelog.weiqumeta.com',
-	test: 'https://testlog.weiqumeta.com',
+	prod: 'https://log.denetnet.net',
+	pre: 'https://pretestlog.denetme.net',
+	test: 'https://testlog.denetme.net',
 };
 
-const logAPIUrl = logApi[process.env.NUXT_ENV.MODE] + '/log-center';
+const logAPIUrl = logApi[process.env.NUXT_ENV.MODE] + '/denet/log';
 
 /**
  * @eventData 以键值对存储,会在最终上报里解开的参数
@@ -40,10 +40,13 @@ function paramsPretreatmentAndRequest(logType, params) {
 	};
 	eventData = wrapObject(extData);
 	params.params.logType = logType;
-	params.params.eventData = JSON.stringify(eventData);
-	params.params.extParams = JSON.stringify(extParams);
 
-	axios.post(`${logAPIUrl}/statistics/uploadLogFromFrontend`, params);
+	detectExtension(denetExtensionId, (isInstall) => {
+		eventData.isExtensionInstalled = isInstall ? 1 : 0;
+		params.params.eventData = JSON.stringify(eventData);
+		params.params.extParams = JSON.stringify(extParams);
+		axios.post(`${logAPIUrl}/uploadLogFromFrontend`, params);
+	});
 }
 
 function wrapObject(extParams) {

+ 3 - 3
pages/treasure/index.vue

@@ -195,9 +195,6 @@ export default {
 	methods: {
 		clickBtn() {
 			if (this.isChrome) {
-				let { extensionsInstallUrl } = this.config;
-				window.open(extensionsInstallUrl);
-			} else {
 				Report.reportLog({
 					baseInfo: {
 						appVersionCode: appVersionCode,
@@ -216,6 +213,9 @@ export default {
 						},
 					},
 				});
+				let { extensionsInstallUrl } = this.config;
+				window.open(extensionsInstallUrl);
+			} else {
 				this.installChrome();
 			}
 		},

+ 3 - 3
pages/treasure/invite.vue

@@ -202,9 +202,6 @@ export default {
 	methods: {
 		clickBtn() {
 			if (this.isChrome) {
-				let { extensionsInstallUrl } = this.config;
-				window.open(extensionsInstallUrl);
-			} else {
 				Report.reportLog({
 					baseInfo: {
 						appVersionCode: appVersionCode,
@@ -223,6 +220,9 @@ export default {
 						},
 					},
 				});
+				let { extensionsInstallUrl } = this.config;
+				window.open(extensionsInstallUrl);
+			} else {
 				this.installChrome();
 			}
 		},

+ 13 - 0
utils/help.js

@@ -237,3 +237,16 @@ export function getQueryString(name) {
 	}
 	return null;
 }
+
+export const denetExtensionId = 'inlfbeejfdgkknpiodhemfcokbdgofja';
+export function detectExtension(extensionId, callback) {
+	var img;
+	img = new Image();
+	img.src = 'chrome-extension://' + extensionId + '/img/icon-denet-logo.svg';
+	img.onload = function () {
+		callback(true);
+	};
+	img.onerror = function () {
+		callback(false);
+	};
+}