commit for removing extra files

Author: Philip Zhang

backend-sync.sh

@@ -1,10 +1,12 @@
+export SDKMAN_DIR="$HOME/.sdkman"
+[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
 
 MODELNAME=retailscm
 [email protected]
-cd ~/githome/${MODELNAME}-biz-suite/ && rm -rf bizcore/WEB-INF/${MODELNAME}_core_src
-java -jar ~/githome/splitter.jar ${MODELNAME}
+# cd ~/githome/${MODELNAME}-biz-suite/ && rm -rf bizcore/WEB-INF/${MODELNAME}_core_src
+# java -jar ~/githome/splitter.jar ${MODELNAME}
 # cd ~/githome/${MODELNAME}-biz-suite/&& git pull --allow-unrelated-histories && cd ../
-cd ~/githome/${MODELNAME}-biz-suite/bizcore&& ~/.sdkman/candidates/gradle/5.2.1/bin/gradle classes && cd ../../
+cd ~/githome/${MODELNAME}-biz-suite/bizcore&& gradle classes && cd ../../
 cd ~/githome/${MODELNAME}-biz-suite/ && rsync -avz   bizcore/* ${DEST_HOST}:~/resin-3.1.12/webapps/${MODELNAME}/
 ssh ${DEST_HOST} "mysqldump -h127.0.0.1  -u root --password=0254891276 --skip-quick --skip-tz-utc --skip-dump-date --skip-set-charset --skip-quote-names --skip-comments ${MODELNAME} > backup/${MODELNAME}.$(date +%Y%m%dT%H%M%S).sql"
 ssh ${DEST_HOST} "mysql -uroot -p0254891276 -h 127.0.0.1 < resin-3.1.12/webapps/${MODELNAME}/WEB-INF/${MODELNAME}_core_src/META-INF/${MODELNAME}_mysql.sql"

bizcore/WEB-INF/caf_core_src/com/skynet/bootstrap/AppEntrance.java

@@ -4,29 +4,21 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 //import org.springframework.boot.autoconfigure.elasticsearch.rest.RestClientAutoConfiguration;
+import org.springframework.boot.autoconfigure.elasticsearch.rest.RestClientAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.web.servlet.DispatcherServlet;
 
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, RestClientAutoConfiguration.class, KafkaAutoConfiguration.class})
 @ImportResource(locations = {"classpath:/META-INF/spring.xml", "classpath:/META-INF/online-system.xml"})
 @ServletComponentScan(basePackageClasses = {UCInvocationServlet.class})
 public class AppEntrance {
     public static void main(String[] args) {
         SpringApplication.run(AppEntrance.class, args);
     }
 
-    @Bean
-    public ServletRegistrationBean dispatcherRegistration(DispatcherServlet dispatcherServlet) {
-        ServletRegistrationBean reg = new ServletRegistrationBean(dispatcherServlet);
-        reg.getUrlMappings().clear();
-        reg.addUrlMappings("*.css");
-        reg.addUrlMappings("*.txt");
-        reg.addUrlMappings("*.js");
-        reg.addUrlMappings("*.jpg");
-        return reg;
-    }
 }

bizcore/WEB-INF/caf_core_src/com/skynet/infrastructure/CacheService.java

@@ -5,6 +5,7 @@
 public interface CacheService {
 	public Object get(String key, Class<?> clazz) ;
 	public void put(String key, Object value, int ttlInSeconds) ;
+	public List<Object> mget(List<String> keys, Class<?> clazz) ;
 	public void remove(String key) ;
 
 	default void lpush(String key, Object value , int ttlInSeconds){};

bizcore/WEB-INF/caf_core_src/com/skynet/infrastructure/InMemoryCacheService.java

@@ -1,6 +1,7 @@
 package com.skynet.infrastructure;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class InMemoryCacheService  extends InfraBaseService implements CacheService {
@@ -16,6 +17,9 @@ public Object get(String key,Class<?> clazz) {
 			return cacheMap.get(key);
 		}
 	}
+	public List<Object> mget(List<String >keys,Class<?> clazz) {
+		throw new IllegalStateException("InMemoryCacheService not implemented mget(List<String >keys,Class<?> clazz)");
+	}
 
 	public void put(String key, Object value,int ttlInSeconds) {
 		ensureCacheMap();

bizcore/WEB-INF/caf_core_src/com/skynet/infrastructure/RedisCacheService.java

@@ -9,6 +9,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class RedisCacheService implements CacheService {
@@ -34,21 +35,25 @@ public void setTimeout(int timeout) {
     }
 
     protected Jedis getJedis() {
+    	
         Jedis jedis = new Jedis(host, port, timeout);
         if (StringUtils.isNotEmpty(password)) {
             jedis.auth(password);
         }
         return jedis;
     }
-
+    
 
     protected ObjectMapper getMapper() {
         ObjectMapper mapper;
         mapper = new ObjectMapper();
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         return mapper;
+  
+    }
+    protected Class<?> classAt(Class<?>[] clazzes, int index){
+    	return clazzes[index];
     }
-
     public Object[] mget(String keys[], Class<?>[] clazzes) {
         if (keys == null) {
             return new Object[0];
@@ -62,9 +67,10 @@ public Object[] mget(String keys[], Class<?>[] clazzes) {
             jedis = getJedis();
             log("class" + jedis.getClass());
             // ticker.tick("init getJedis();");
-
+            
             List<String> values = jedis.mget(keys);
             if (values == null) {
+            	log("jedis.mget(keys) return null!!!");
                 return null;
             }
             // ticker.tick("jedis.get(key);");
@@ -85,8 +91,9 @@ public Object[] mget(String keys[], Class<?>[] clazzes) {
             return null;
         } finally {
             closeConnection(jedis);
-        }
 
+        }
+        
     }
 
     public Object get(String key, Class<?> clazz) {
@@ -113,7 +120,8 @@ public Object get(String key, Class<?> clazz) {
             log("getting " + clazz + " with key: " + key + " with an exception" + e.getMessage());
             return null;
         } finally {
-            closeConnection(jedis);
+
+        	closeConnection(jedis);
         }
 
     }
@@ -143,17 +151,19 @@ public void put(String key, Object value, int ttlInSeconds) {
         } catch (JsonProcessingException e) {
             // is fine
         } finally {
+
             closeConnection(jedis);
         }
 
     }
 
-    protected void closeConnection(Jedis jedis) {
 
-        if (jedis == null) {
+    protected void closeConnection(Jedis jedis) {
+    	
+    	if (jedis == null) {
             return;
         }
-        jedis.close();
+    	jedis.close();
     }
 
     public void remove(String key) {
@@ -163,6 +173,7 @@ public void remove(String key) {
             jedis = getJedis();
             jedis.del(key);
         } finally {
+
             closeConnection(jedis);
         }
     }
@@ -271,9 +282,26 @@ private <T> List<T> convertStringToList(String pS, Class<T> pClazz) {
         try {
             return (List<T>) mapper.readValue(pS, javaType);
         } catch (IOException pE) {
+        	//closeConnection(jedis);
+
         }
         return null;
     }
 
+	@Override
+	public List<Object> mget(List<String> keys, Class<?> clazz) {
+		Class<?>[] clazzes = new Class<?>[keys.size()];
+		for(int i=0;i<clazzes.length;i++) {
+			clazzes[i] = clazz;
+		}
+		Object [] mObjects = this.mget(keys.toArray(new String[] {}), clazzes);
+		
+		if(mObjects==null) {
+			return new ArrayList<Object>();
+		}
+		
+		return Arrays.asList(mObjects);
+	}
+
 
 }

bizcore/WEB-INF/caf_core_src/com/terapico/caf/ServletResultRenderer.java

@@ -36,7 +36,8 @@ protected void renderMimeObjectResult(HttpServlet servlet, InvocationResult resu
 			throw new IllegalArgumentException("The return object is not a blob");
 		}
 		BlobObject blob = (BlobObject) actualResult;
-
+		response.addHeader("X-Env-Type", result.getEnvType());
+		response.addHeader("X-Env-Name", result.getEnvName());
 		response.setCharacterEncoding(null);
 		response.setContentType(blob.getMimeType());
 		response.getOutputStream().write(blob.getData());
@@ -176,15 +177,16 @@ protected boolean hasHeaderWithValue(HttpServletRequest request, String header,
 	private ObjectMapper objectMapper = null;
 
 	protected ObjectMapper getObjectMapper() {
-		if (objectMapper == null) {
-			objectMapper = new ObjectMapper();
-			return objectMapper;
-			// DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-			// objectMapper.setDateFormat(df);
-		}
-
-		return objectMapper.copy();
-
+		//// objectMapper = null;
+		// if(objectMapper == null){
+		// objectMapper = new ObjectMapper();
+		// return objectMapper;
+		// //DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+		// //objectMapper.setDateFormat(df);
+		// }
+		//
+		// return objectMapper.copy();
+		return new ObjectMapper();
 	}
 
 	protected void fillOrigin(InvocationResult result, HttpServletRequest request, HttpServletResponse response) {
@@ -195,17 +197,19 @@ protected void fillOrigin(InvocationResult result, HttpServletRequest request, H
 		response.addHeader("Access-Control-Allow-Origin", origin);
 		response.addHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
 		// Access-Control-Expose-Headers
-		response.addHeader("Access-Control-Expose-Headers", "Set-Cookie");
+		response.addHeader("Access-Control-Expose-Headers", "Set-Cookie, X-Redirect, X-Env-Type, X-Env-Name");
 		response.addHeader("Access-Control-Allow-Credentials", "true");
 
 	}
+
 	protected String renderLogResult(Object value) {
-		if(ReflectionTool.isPrimaryType(value.getClass())) {
+		if (ReflectionTool.isPrimaryType(value.getClass())) {
 			return value.toString();
 		}
 		return "<Object>";
-		
+
 	}
+
 	protected void renderJson(InvocationResult result, HttpServletRequest request, HttpServletResponse response)
 			throws ServletException, IOException {
 
@@ -218,13 +222,14 @@ protected void renderJson(InvocationResult result, HttpServletRequest request, H
 			renderClass = result.getResponseHeader().get("X-Class");
 		}
 		response.addHeader("X-Class", renderClass);
-		response.addHeader("Access-Control-Expose-Headers", "X-Class");
+		response.addHeader("X-Env-Type", result.getEnvType());
+		response.addHeader("X-Env-Name", result.getEnvName());
+		response.addHeader("Access-Control-Expose-Headers", "X-Class, X-Redirect, X-Env-Type, X-Env-Name");
 		// Access-Control-Expose-Headers
-		
-		log("Render JSON result with class: " + renderClass+"("+renderLogResult(result.getActualResult())+")");
-		//BeanCreationException
-		
-		
+
+		log("Render JSON result with class: " + renderClass + "(" + renderLogResult(result.getActualResult()) + ")");
+		// BeanCreationException
+
 		// Access-Control-Allow-Origin
 		fillOrigin(result, request, response);
 		// Access-Control-Allow-Credentials: true
@@ -272,6 +277,7 @@ protected void renderJson(InvocationResult result, HttpServletRequest request, H
 		return;
 
 	}
+
 	protected Message constructionBeanCreateMessage() {
 		Message message =  new Message();
 		message.setLevel("fatal");
@@ -295,6 +301,8 @@ protected void renderHTMLPage(HttpServlet servlet, InvocationResult result, Http
 		if (result.getResponseHeader() != null && result.getResponseHeader().containsKey("X-Class")) {
 			renderClass = result.getResponseHeader().get("X-Class");
 		}
+		response.addHeader("X-Env-Type", result.getEnvType());
+		response.addHeader("X-Env-Name", result.getEnvName());
 		response.addHeader("X-Class", renderClass);
 		// 其他header
 		if (result.getResponseHeader() != null) {
@@ -318,6 +326,8 @@ protected void renderJavascript(HttpServlet servlet, InvocationResult result, Ht
 		response.setCharacterEncoding("UTF-8");
 		response.setContentType("application/javascript");
 		response.addHeader("Cache-Control", "no-cache, must-revalidate");
+		response.addHeader("X-Env-Type", result.getEnvType());
+		response.addHeader("X-Env-Name", result.getEnvName());
 		// 其他header
 		if (result.getResponseHeader() != null) {
 			for (String hName : result.getResponseHeader().keySet()) {

bizcore/WEB-INF/caf_core_src/com/terapico/caf/SimpleInvocationServlet.java

@@ -7,6 +7,8 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SimpleInvocationServlet extends HttpServlet {
 	/**
@@ -162,14 +164,16 @@ protected InvocationResult invoke(InvocationContext context) throws ServletExcep
 		}
 
 	}
-
+	
+	
+	private static final Logger logger = LoggerFactory.getLogger(SimpleInvocationServlet.class);
+	
 	private void logInfo(String message) {
-		// TODO Auto-generated method stub
-		String logMessage = timeExpr() + "  " + message;
-		System.out.println(logMessage);
-
+		
+		logger.info(message);
+		
 	}
-
+	
 	ServletInvocationContextFactory factory;
 
 	protected InvocationContext createInvocationContext(HttpServletRequest request) throws InvocationException {

bizcore/WEB-INF/caf_core_src/com/terapico/caf/baseelement/RedirectTarget.java

@@ -0,0 +1,26 @@
+package com.terapico.caf.baseelement;
+
+public class RedirectTarget{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	protected String redirectUrl;
+
+	public RedirectTarget(String url) {
+	    redirectUrl = url;
+	}
+
+	public RedirectTarget() {
+	}
+
+	public String getRedirectUrl() {
+		return redirectUrl;
+	}
+
+	public void setRedirectUrl(String redirectUrl) {
+		this.redirectUrl = redirectUrl;
+	}
+	
+	
+}

bizcore/WEB-INF/caf_core_src/com/terapico/uccaf/BaseUserContext.java

@@ -13,4 +13,7 @@ public interface BaseUserContext {
 	public boolean isProductEnvironment();
 	public String getEnvironmentName();
 	public Map<String, String> getResponseHeaders();
+	public Object getFromContextLocalStorage(String key);
+	public void putIntoContextLocalStorage(String key, Object value);
+	public void log(String message);
 }