Commit 7750e807 by Li Yongyu

add

parent d50e9c24
...@@ -60,7 +60,7 @@ public class Reflect_api { ...@@ -60,7 +60,7 @@ public class Reflect_api {
String system = MapUtil.getValue("system", data); String system = MapUtil.getValue("system", data);
String classRoute = ReadProperties.GetPropertyByKey(system); String classRoute = ReadProperties.GetPropertyByKey(system);
//判断同样的类地址时候走哪一个测试类脚本
if(system.contains("study")){ if(system.contains("study")){
String classReflectName = ReadProperties.GetPropertyByClassName(serviceUrl,system); String classReflectName = ReadProperties.GetPropertyByClassName(serviceUrl,system);
if ( classReflectName!=null ) { if ( classReflectName!=null ) {
......
...@@ -82,7 +82,6 @@ public class RequestDataUtils { ...@@ -82,7 +82,6 @@ public class RequestDataUtils {
String system = MapUtil.getValue("system", data); String system = MapUtil.getValue("system", data);
system = replaceString(system); system = replaceString(system);
com.offcn.system.system tem = (com.offcn.system.system) (BasicsGM.map.get(system)); com.offcn.system.system tem = (com.offcn.system.system) (BasicsGM.map.get(system));
RequestDataUtils rdu = new RequestDataUtils(); RequestDataUtils rdu = new RequestDataUtils();
String path=""; String path="";
if(myRequest.getUrl().startsWith("http://")){ if(myRequest.getUrl().startsWith("http://")){
......
...@@ -31,7 +31,7 @@ import net.sf.json.JSONObject; ...@@ -31,7 +31,7 @@ import net.sf.json.JSONObject;
/** /**
* 获取班级名称列表 * im登陆获取im_token
* *
* @author liyy * @author liyy
* *
......
...@@ -72,8 +72,11 @@ public class APITest_study extends BasicsGM{ ...@@ -72,8 +72,11 @@ public class APITest_study extends BasicsGM{
//静态和动态参数自动添加 //静态和动态参数自动添加
// data = setPublicParameter(data); // data = setPublicParameter(data);
// data = setDynamicParameter(data); // data = setDynamicParameter(data);
if (data.get("serviceUrl").toString().contains("needsetPublicParameter")) {
data=setPublicParameter(c,object,data);//静态公共参数 data=setPublicParameter(c,object,data);//静态公共参数
data=setDynamicParameter(c,object,data);//动态公共参数 data=setDynamicParameter(c,object,data);//动态公共参数
}
String parameter = MapUtil.getValue("parameter", data); String parameter = MapUtil.getValue("parameter", data);
System.out.println("parameter=====" + parameter); System.out.println("parameter=====" + parameter);
......
study=com.offcn.api.study. study_ticket=com.offcn.api.study.
study_api=com.offcn.api.study.studyapi. study_api=com.offcn.api.study.studyapi.
studyl=com.offcn.api.study.study_l.
\ No newline at end of file
...@@ -14,7 +14,18 @@ ...@@ -14,7 +14,18 @@
<redis_db_index>5</redis_db_index> <redis_db_index>5</redis_db_index>
</system> </system>
<system name="studyl"><!-- 学习中心 -->
<access_token_uri>http://106.75.5.205:8082/uaa/oauth/token</access_token_uri>
<client_id>bestbuy-acceptance</client_id>
<client_secret>bestbuy-acceptance</client_secret>
<grant_type>client_credentials</grant_type>
<isProduct>N</isProduct>
<RM_URI>http://l.t.eoffcn.com</RM_URI>
<RM_port></RM_port>
<RM_basePath></RM_basePath>
<redis_URI>10.10.229.48</redis_URI>
<redis_db_index>5</redis_db_index>
</system>
</systems> </systems>
\ No newline at end of file
...@@ -19,6 +19,8 @@ public class maxiao implements Runnable{ ...@@ -19,6 +19,8 @@ public class maxiao implements Runnable{
public maxiao(String jSESSIONID) { public maxiao(String jSESSIONID) {
JSESSIONID = jSESSIONID; JSESSIONID = jSESSIONID;
} }
@Override @Override
......
package test; package test;
import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.Locale;
public class test { public class test {
...@@ -10,6 +12,9 @@ public class test { ...@@ -10,6 +12,9 @@ public class test {
String year = getCurrentYear(); String year = getCurrentYear();
System.out.println(year); System.out.println(year);
String datatime = DateFormat.getDateTimeInstance(2, 2, Locale.CHINESE).format(new java.util.Date());;
System.out.println(datatime);
} }
public static String getCurrentYear(){ public static String getCurrentYear(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment