单点，sap

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/TransferBillService.java

@@ -27,7 +27,8 @@ public class TransferBillService extends BaseBean {
 		try {
 			logger_8574e473.error(String.valueOf("TransferBillService--start"));
 //			String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htk3oasync.lplyhtk_url")).trim();
-			String url = configProp.getLplysl_url();
+			String url = configProp.getLplyhtk_url();
+			logger_8574e473.error(String.valueOf("TransferBillService--url" + url));
 			TransferBillServiceStub stub = new TransferBillServiceStub(url);
 			stub._getServiceClient().getOptions().setProperty("__CHUNKED__", Boolean.FALSE);
 			stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SAPConn.java

@@ -7,13 +7,19 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.util.Properties;
 import java.lang.*;
+
+import com.weaver.common.hrm.util.Util;
+import com.weaver.common.i18n.tool.util.I18nContextUtil;
+import com.weaver.ebuilder.common.util.TenantContext;
+import com.weaver.verupgrade.conn.CONN_TYPE;
+import com.weaver.verupgrade.conn.RecordSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 
 public class SAPConn {
 
-//    private static final Logger logger_cb5e740f = LoggerFactory.getLogger(SAPConn.class);
+    private static final Logger logger_cb5e740f = LoggerFactory.getLogger(SAPConn.class);
 
     static String ABAP_AS = "ABAP_AS_WITHOUT_POOL";
 
@@ -50,7 +56,7 @@ public class SAPConn {
      */
     private static void init() {
         try {
-//            logger_cb5e740f.error(String.valueOf("-------------SAP Client Connects Start ----------------"));
+            logger_cb5e740f.error(String.valueOf("-------------SAP Client Connects Start ----------------"));
             // sapclient = bb.getPropValue("SAPConn", "SAPClient");
             // userid = bb.getPropValue("SAPConn", "Userid");
             // password = bb.getPropValue("SAPConn", "Password");
@@ -58,14 +64,40 @@ public class SAPConn {
             // systemnumber = bb.getPropValue("SAPConn", "SystemNumber");
             // Language = bb.getPropValue("SAPConn", "Language");
             // 测试200  正式 800
-            sapclient = "200";
+//            sapclient = "200";
-            // 测试OAUSER 正式 OAADMIN
+//            // 测试OAUSER 正式 OAADMIN
-            userid = "OAUSER";
+//            userid = "OAUSER";
-            // 测试 htjt2016   正式 HTjt@group.COM
+//            // 测试 htjt2016   正式 HTjt@group.COM
-            password = "htjt2016";
+//            password = "htjt2016";
-            // 测试10.6.6.80  正式 10.6.6.88
+//            // 测试10.6.6.80  正式 10.6.6.88
-            hostname = "10.6.6.80";
+//            hostname = "10.6.6.80";
-            systemnumber = "00";
+//            systemnumber = "00";
+
+            String currentTenantKey = TenantContext.getCurrentTenantKey();
+
+            RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
+            String poolname ="E10JTZH";
+            String sql = "select sapclient, yh,mm,hostname, systemnumber from e10_common.dbo.uf_sapclient where delete_type = 0 and sfqy = 1";
+            logger_cb5e740f.error("sql = " + sql);
+            logger_cb5e740f.error("poolname = " + poolname);
+            logger_cb5e740f.error("currentTenantKey = " + currentTenantKey);
+            rs.setTenantKey(currentTenantKey);
+            rs.executeSql(sql,poolname);
+
+            if (rs.next()){
+                sapclient = rs.getString("sapclient");
+                userid =rs.getString("yh");
+                password = rs.getString("mm");
+                hostname =rs.getString("hostname");
+                systemnumber = rs.getString("systemnumber");
+            }
+            logger_cb5e740f.error("sapclient = " + sapclient);
+            logger_cb5e740f.error("userid = " + userid);
+            logger_cb5e740f.error("password = " + password);
+            logger_cb5e740f.error("hostname = " + hostname);
+            logger_cb5e740f.error("systemnumber = " + systemnumber);
+
+
             Language = "ZH";
             // SAPROUTER = "/H/202.111.37.66/W/3456789/H/";
             Properties connectProperties = new Properties();
@@ -82,9 +114,9 @@ public class SAPConn {
             // 测试10
             connectProperties.setProperty(DestinationDataProvider.JCO_PEAK_LIMIT, "20");
             createDataFile(ABAP_AS_POOLED, "jcoDestination", connectProperties);
-//            logger_cb5e740f.error(String.valueOf("get connection success"));
+            logger_cb5e740f.error(String.valueOf("get connection success"));
         } catch (Exception e) {
-//            logger_cb5e740f.error(String.valueOf("get connection error:" + e));
+            logger_cb5e740f.error( "get connection error:", e) ;
         }
     }
 
@@ -115,9 +147,8 @@ public class SAPConn {
             init();
             destination = JCoDestinationManager.getDestination(ABAP_AS);
             destination.ping();
-            System.out.println("ABAP_AS 	Attributes:");
+            logger_cb5e740f.error("ABAP_AS 	Attributes:");
-            System.out.println(destination.getAttributes());
+            logger_cb5e740f.error(String.valueOf(destination.getAttributes()));
-            System.out.println();
             destination = JCoDestinationManager.getDestination(ABAP_AS_POOLED);
             destination.ping();
 //            logger_cb5e740f.error(String.valueOf("ABAP_AS_POOLED	Attributes:"));

secondev-ht-njwebservice/src/main/java/com/weaver/custom/configcenter/htportaloaUrlConfig.java

@@ -0,0 +1,18 @@
+package com.weaver.custom.configcenter;
+
+import com.weaver.framework.client.annotation.WeaverConfigCenter;
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@WeaverConfigCenter(sources = {
+        @WeaverConfigCenter.ConfigProperty(
+                dataId = "weaver-secondev-htportaloaUrl.properties",
+                group = "DEFAULT_GROUP",
+                refresh = "true")
+})
+public class htportaloaUrlConfig {
+
+
+}

secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/OutToDoWorkflowService.java

@@ -125,8 +125,8 @@ public class OutToDoWorkflowService {
                 wftodo.workflowName = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowName());
                 wftodo.workflowTypeId = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowTypeId());
                 wftodo.workflowTypeName = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowTypeName());
-                wftodo.mobileurl = mobile_url + URLEncoder.encode("http://oateste10.hengtonggroup.com.cn:20600/papi/secondev/sso/custom/login?target=jt&redirectUrl=/sp/workflow/flowpage/fullView/" + wftodo.requestId);
+                wftodo.mobileurl = mobile_url + configProp.getHtportaloaUrl_pc_url() +"/mobile/workflow/flowpage/view/"+ wftodo.requestId;
-                wftodo.pcurl = pc_url + URLEncoder.encode("http://oateste10.hengtonggroup.com.cn:20600/papi/secondev/sso/custom/login?target=jt&redirectUrl=/sp/workflow/flowpage/fullView/" + wftodo.requestId);
+                wftodo.pcurl = pc_url + configProp.getHtportaloaUrl_pc_url() +"/sp/workflow/flowpage/fullView/"+ wftodo.requestId;
                 todo[i] = wftodo;
             }
             res.setWorkFlow(todo);

secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/prop/ConfigProp.java

@@ -20,5 +20,8 @@ public class ConfigProp {
     @Value("${jtzhadmin}")
     private String jtzhadmin;
 
+    @Value("${htportaloaUrl-pc_url}")
+    private String htportaloaUrl_pc_url;
+
 
 }

secondev6-jshts/src/main/java/com/weaver/seconddev/cussso/service/CusSSOServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.weaver.common.base.entity.result.WeaResult;
+import com.weaver.common.ei.utils.Util;
 import com.weaver.common.hrm.domain.organization.HrmConditionResultType;
 import com.weaver.common.hrm.domain.organization.HrmOrgEmpCondition;
 import com.weaver.common.hrm.entity.employee.HrmEmployee;
@@ -12,6 +13,7 @@ import com.weaver.common.hrm.remote.HrmRemoteEmployeeService;
 import com.weaver.ebuilder.datasource.api.enums.SourceType;
 import com.weaver.ebuilder.datasource.api.service.DataSetService;
 import com.weaver.framework.rpc.annotation.RpcReference;
+import com.weaver.mc.util.StringUtils;
 import com.weaver.teams.api.remote.RemotePassportService;
 import com.weaver.teams.domain.user.SimpleEmployee;
 import com.weaver.teams.passport.entity.ThirdSSOLoginRequest;
@@ -51,7 +53,8 @@ public class CusSSOServiceImpl {
 
     public Map<String, String> login(HttpServletRequest request, HttpServletResponse response) throws Exception {
         Map<String, String> loginMap = new HashMap();
-        String redirectUrl = request.getParameter("redirectUrl");
+        String redirectUrl = Util.null2String(request.getParameter("redirectUrl"));
+        String target = Util.null2String(request.getParameter("target"));
         log.error("sd6=>redirectUrl:" + java.net.URLDecoder.decode(redirectUrl, "utf-8"));
         String ltpaToken = "123";
         Cookie[] cks = request.getCookies();
@@ -161,6 +164,12 @@ public class CusSSOServiceImpl {
                 }
                 JSONObject useInfo = getUser(simpleEmployee.getEmployeeId());
                 String filed3 = useInfo.getString("field3");//获取租户的标识
+                if(StringUtils.isNotEmpty(target)){
+                    if(target.equals("jt")){
+                        filed3 = "";
+                    }
+                }
+
                 //查需要登录得租户
 //                HrmEmployee hrmEmployee = getLoginTk(employeeByLoginName.getEmployeeId(), maintk);
 //                tk = hrmEmployee.getTenantKey();