Merge branch 'xgg-deliver' into xgg-deliver-ali

xgg-deliver/app/base/controller/impl/uc/userCtl.js

@@ -43,14 +43,21 @@ class UserCtl extends CtlBase {
       loginUser = loginUser.data;
       var loginKey = await this.setLogin(loginUser);
       let ntapi = settings.ntapi();
+      let loginUrl = settings.protocalPrefix + req.headers['host'] + "/#/logins";
+      console.log(loginUrl, "---------------loginUrl--------------");
+      let loginBaseUrl = system.base64_encode(loginUrl);
+      let test = system.base64_decode(loginBaseUrl);
+      console.log(test);
+
       let rs = {
         key: loginKey.xggadminsid,
-        taxLoginUrl: ntapi.taxLoginUrl + `?username=${loginUser.ucname}&cookieId=${loginKey.subsid}&target=tax`,
-        finLoginUrl: ntapi.taxLoginUrl + `?username=${loginUser.ucname}&cookieId=${loginKey.subsid}`,
+        taxLoginUrl: ntapi.taxLoginUrl + `?username=${loginUser.ucname}&cookieId=${loginKey.subsid}&target=tax&baseurl=${loginBaseUrl}`,
+        finLoginUrl: ntapi.taxLoginUrl + `?username=${loginUser.ucname}&cookieId=${loginKey.subsid}&baseurl=${loginBaseUrl}`,
         loginname: loginUser.ucname,
         auth: loginUser.auth,
         isManager: loginUser.isManager,
-        menus: {gtArr: this.getOrderMenu(loginUser), pjArr: this.getInvoiceMenu(loginUser)}
+        menus: {gtArr: this.getOrderMenu(loginUser), pjArr: this.getInvoiceMenu(loginUser)},
+        loginUrl: loginUrl,
       };
 
       return system.getResultSuccess(rs);

xgg-deliver/app/base/service/impl/common/deliverSve.js

@@ -89,8 +89,9 @@ class DeliverService extends ServiceBase {
       staffNo: user.id,
       staffName: user.real_name,
       loginId: user.ucname,
-      pwd: password,
+      pwd: password || "",
     };
+
     if(user.isAdmin) {
       data.classType = "leader";
       data.className = "主管";

xgg-deliver/app/base/system.js

-var fs = require("fs");
-var objsettings = require("../config/objsettings");
-var settings = require("../config/settings");
+const fs = require("fs");
+const objsettings = require("../config/objsettings");
+const settings = require("../config/settings");
+const Base64 = require('js-base64').Base64;
+
 class System {
 	static declare(ns) {
 		var ar = ns.split('.');
@@ -144,6 +146,15 @@ class System {
 			}
 		}
 	}
+
+	static base64_encode(str) {
+		return Base64.encodeURI(str || "");
+	}
+
+	static base64_decode(str) {
+		return Base64.decode(str || "");
+	}
+
 	static getUid(len, radix) {
 		var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
 		var uuid = [],

xgg-deliver/app/config/settings.js

@@ -18,7 +18,7 @@ var settings = {
   commonroleid: 1,
   passroleid: 2,
   tanentroleid: 1,
-  protocalPrefix: "http://",
+  protocalPrefix: ENVINPUT.APP_ENV == "dev" ? "http://" : "https://",
 
   appKey: ENVINPUT.APP_ENV == "dev" ? "2f41920e82fa46dd98887d81df9457ab" : "728b979f7afd4413ac683344cd4a97fa",
   secret: ENVINPUT.APP_ENV == "dev" ? "ede9b66ddb964d15b0a543b7ac7bb28f" : "f8891fcf37574f5a9f21b3030c302f4a",
@@ -91,7 +91,7 @@ var settings = {
       domain_page = "https://nt.gongsibao.com";
     } else {
       domain = "https://nga-api.gongsibao.com";
-      domain_page = "https://ali-saas.gongsibao.com";
+      domain_page = "https://nga.gongsibao.com";
     }
 
     return {