修改添加多环境

src/main/java/com/uas/eis/serviceImpl/ErpServiceImpl.java

@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.uas.eis.dao.BaseDao;
 import com.uas.eis.dao.SqlRowList;
-import com.uas.eis.entity.Employee;
 import com.uas.eis.entity.Master;
 import com.uas.eis.service.EnterpriseService;
 import com.uas.eis.service.ErpService;
@@ -48,11 +47,11 @@ public class ErpServiceImpl implements ErpService {
         int count = baseDao.getCount("select count(*) from prodinout where nvl(pi_issendxx,0)<>0 and pi_id=" + id);
         if (count>0){
             Master master = enterpriseService.getMasterByName(masterName);;
-            String baseUrl = baseUrlUtil.getBaseUrl("WMS");
+            String baseUrl = baseUrlUtil.getBaseUrl("WMS",master.getMa_env());
             String piClass = baseDao.getFieldValue("prodinout", "pi_class", "pi_id=" + id, String.class);
             String inoutno = baseDao.getFieldValue("prodinout", "pi_inoutno", "pi_id=" + id, String.class);
             try {
-                String Authorization = "Bearer "+ tokenCaches.getTokenCache("ProdInOutToken");
+                String Authorization = "Bearer "+ tokenCaches.getTokenCache("ProdInOutToken",master.getMa_env());
                 String url="";
                 Object inorout = baseDao.getFieldDataByCondition("DOCUMENTSETUP", "ds_inorout", "DS_NAME='" + piClass + "'");
                 Boolean isOut=false;
@@ -302,7 +301,7 @@ public class ErpServiceImpl implements ErpService {
         int count = baseDao.getCount("select count(*) from prodinout where nvl(pi_issendxx,0)<>0 and pi_id=" + id);
         if(count>0){
             Master master = enterpriseService.getMasterByName(masterName);;
-            String baseUrl = baseUrlUtil.getBaseUrl("WMS");
+            String baseUrl = baseUrlUtil.getBaseUrl("WMS",master.getMa_env());
             String inoutno = baseDao.getFieldValue("prodinout", "pi_inoutno", "pi_id=" + id, String.class);
             String piClass = baseDao.getFieldValue("prodinout", "pi_class", "pi_id=" + id, String.class);
             Object inorout = baseDao.getFieldDataByCondition("DOCUMENTSETUP", "ds_inorout", "DS_NAME='" + piClass + "'");
@@ -312,7 +311,7 @@ public class ErpServiceImpl implements ErpService {
             }else{
                 orderType="IN";
             }
-            String Authorization = "Bearer "+ tokenCaches.getTokenCache("ProdInOutToken");
+            String Authorization = "Bearer "+ tokenCaches.getTokenCache("ProdInOutToken",master.getMa_env());
             Map<String, Object> dataMap = new HashMap<>();
             dataMap.put("master",master.getMa_user());
             dataMap.put("inOutId",id);
@@ -375,9 +374,9 @@ public class ErpServiceImpl implements ErpService {
         Map<String, Object> modelMap = new HashMap<String, Object>();
         Master master = enterpriseService.getMasterByName(masterName);
         //域名
-        String baseUrl = baseUrlUtil.getBaseUrl("WMS");
+        String baseUrl = baseUrlUtil.getBaseUrl("WMS",master.getMa_env());
         //请求头
-        String Authorization = "Bearer "+ tokenCaches.getTokenCache("ProdInOutToken");
+        String Authorization = "Bearer "+ tokenCaches.getTokenCache("ProdInOutToken",master.getMa_env());
         //传数据到湘芯科技
         Map<String, Object> dataMaps = new HashMap<>();
         List<Map<String, Object>> entrys = new LinkedList<Map<String, Object>>();
@@ -573,8 +572,9 @@ public class ErpServiceImpl implements ErpService {
     @Override
     public Map<String, Object> resPushPo(int poId, String masterName) {
         Map<String, Object> modelMap = new HashMap<String, Object>();
-        String baseUrl = baseUrlUtil.getBaseUrl("WMS");
-        String Authorization = "Bearer "+ tokenCaches.getTokenCache("ProdInOutToken");
+        Master master = enterpriseService.getMasterByName(masterName);
+        String baseUrl = baseUrlUtil.getBaseUrl("WMS",master.getMa_env());
+        String Authorization = "Bearer "+ tokenCaches.getTokenCache("ProdInOutToken",master.getMa_env());
         Map<String, Object> dataMap = new HashMap<>();
         String code = baseDao.getFieldValue("customtable", "ct_code", "ct_id=" + poId, String.class);
         dataMap.put("custOrderNo",code);

src/main/java/com/uas/eis/serviceImpl/XiangXServiceImpl.java

@@ -5,10 +5,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.eis.dao.BaseDao;
 import com.uas.eis.entity.Employee;
-import com.uas.eis.service.EmployeeService;
-import com.uas.eis.service.ErpService;
-import com.uas.eis.service.ProdInOutService;
-import com.uas.eis.service.XiangXService;
+import com.uas.eis.entity.Master;
+import com.uas.eis.service.*;
 import com.uas.eis.utils.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -49,6 +47,9 @@ public class XiangXServiceImpl implements XiangXService {
     @Autowired
     private ErpService erpService;
 
+    @Autowired
+    private EnterpriseService enterpriseService;
+
     static final String GET_PROCESS_UNDO_GROUP_U="SELECT * FROM (SELECT JPROCESSVIEW.*,EM_IMID, ROW_NUMBER() OVER(ORDER BY JP_LAUNCHTIME DESC,JP_ID DESC) RN FROM JPROCESSVIEW LEFT JOIN EMPLOYEE ON EM_CODE=JP_LAUNCHERID WHERE ((JP_NODEDEALMAN= ? AND JP_STATUS='待审批' ) AND CONCAT(CONCAT(JP_CODEVALUE,'#'||JP_NAME),'#'||JP_LAUNCHERNAME) LIKE ? ) OR ((JP_LAUNCHERID= ? AND JP_STATUS='未通过')  AND CONCAT(CONCAT(JP_CODEVALUE,'#'||JP_NAME),'#'||JP_PROCESSNOTE) LIKE ? )) WHERE RN<=? AND RN>=? ORDER BY CASE TYPECODE  WHEN 'process' THEN 1 WHEN 'transferprocess' THEN 2 WHEN 'procand' THEN 3 WHEN 'unprocess' THEN 4 END,RN ASC";
     static final String GET_PROCESS_ALREADYDO_U="SELECT * FROM (select JPROCESSALREADYDOVIEW.* ,ROW_NUMBER() OVER(ORDER BY JN_DEALTIME DESC) RN from JPROCESSALREADYDOVIEW WHERE JP_CODEVALUE IS NOT NULL AND CONCAT(CONCAT(JP_NAME,'#'||JP_LAUNCHERNAME),'#'||JP_CODEVALUE) LIKE ? AND JN_DEALMANID= ?)WHERE RN<=? AND RN >= ? ORDER BY RN ASC";
 
@@ -357,8 +358,8 @@ public class XiangXServiceImpl implements XiangXService {
     public void getMaterialSerialNumber(final String piClass, final int inOutId, final String inoutno, final String master){
         new Thread() {
             public void run() {
-                String ma_env = baseDao.getFieldValue("N_DATACENTER.master", "ma_env", "ma_user='"+master+"'", String.class);
-                String Authorization = "Bearer "+ tokenCaches.getTokenCache("ProdInOutToken");
+                Master masterName = enterpriseService.getMasterByName(master);
+                String Authorization = "Bearer "+ tokenCaches.getTokenCache("ProdInOutToken",masterName.getMa_env());
                 Map<String, Object> dataMap = new HashMap<>();
                 dataMap.put("master",master);
                 dataMap.put("thirdPartyOrderCode",inoutno);
@@ -385,7 +386,7 @@ public class XiangXServiceImpl implements XiangXService {
                 // 当前时间戳
                 params.put("timeStamp", timestamp);
                 HttpUtil.Response response = null;
-                String baseUrl = baseUrlUtil.getBaseUrl( "WMS");
+                String baseUrl = baseUrlUtil.getBaseUrl( "WMS",masterName.getMa_env());
                 try {
                     response = HttpUtil.doPostWithHead(baseUrl+"/api/open/entrustOrder/queryMaterialSerialNumber", JSON.toJSONString(params),false,null,Authorization);
                     String res = response.getResponseText();

src/main/java/com/uas/eis/utils/BaseUrlUtil.java

@@ -8,24 +8,23 @@ import org.springframework.stereotype.Component;
 @Component
 public class BaseUrlUtil {
 
-    public String getBaseUrl(String flag) {
+    public String getBaseUrl(String flag,String ma_env) {
         String url = "";
         if (("WMS").equals(flag)){
-            url = "http://scp.test2.cicsc.com";
             //WMS数据对接
-//            if(("test").equals(ma_env)){
-//                url = "http://scp.test2.cicsc.com";
-//            }else if("prod".equals(ma_env)){
-//                url = "http://scp.on.cicsc.com";
-//            }
+            if(("test").equals(ma_env)){
+                url = "http://scp.test.cicsc.com";
+            }else if("prod".equals(ma_env)){
+                url = "http://scp.on.cicsc.com";
+            }
         }else if("Page".equals(flag)){
             //嵌套界面
             url = "http://wms.test2.cicsc.com";
-//            if(("test").equals(ma_env)){
-//                url = "http://wms.test2.cicsc.com";
-//            }else if("prod".equals(ma_env)){
-//                url = "https://scp.cicsc.com";
-//            }
+            if(("test").equals(ma_env)){
+                url = "http://wms.test2.cicsc.com";
+            }else if("prod".equals(ma_env)){
+                url = "https://scp.cicsc.com";
+            }
         }
 
         return url;

src/main/java/com/uas/eis/utils/TokenCaches.java

@@ -22,12 +22,17 @@ public class TokenCaches {
     /**
      * Redis缓存token 取token
      */
-    public String  getTokenCache(String key) {
+    public String  getTokenCache(String key,String ma_env) {
         if (redisUtils.hasKey(key)) {
             return redisUtils.get(key).toString();
         } else {
             if ("ProdInOutToken".equals(key)) {
-                String url = "http://scp.test2.cicsc.com";
+                String url = "";
+                if(("test").equals(ma_env)){
+                    url = "http://scp.test2.cicsc.com";
+                }else if("prod".equals(ma_env)){
+                    url = "http://scp.on.cicsc.com";
+                }
                 HashMap<Object, Object> params = new HashMap<Object, Object>();
                 params.put("appId", "UAS");
                 params.put("appKey", "LTAIE8bntQ4MLMc0");

src/main/resources/application-dev.yml

@@ -5,8 +5,8 @@ spring:
         driverClassName: oracle.jdbc.OracleDriver
         username: N_DATACENTER_TEST2
         password: select!#%*(
-#        url: jdbc:oracle:thin:@10.8.0.19:1521:orcl
-        url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
+        url: jdbc:oracle:thin:@10.8.0.19:1521:orcl
+#        url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
         initialSize: 10
         maxActive: 80
         minIdle: 10
@@ -29,7 +29,7 @@ spring:
         ## Redis服务器地址
         host: 127.0.0.1
         ## Redis服务器连接端口
-        port: 56379
+        port: 6379
         ## Redis服务器连接密码（默认为空）
         password:
         jedis: