commit for removing extra files

Author: philip

backend-sync.sh

@@ -1,8 +1,8 @@
 
 MODELNAME=retailscm
 java -jar ~/githome/splitter.jar ${MODELNAME}
-cd ~/githome/${MODELNAME}-biz-suite/&& git pull --allow-unrelated-histories && cd ../
-cd ~/githome/${MODELNAME}-biz-suite/bizcore&& gradle classes && cd ../../
-cd ~/githome/${MODELNAME}-biz-suite/ && rsync -avz   bizcore/* philipz@philip.doublechaintech.cn:~/resin-3.1.12/webapps/${MODELNAME}/
-ssh philipz@philip.doublechaintech.cn "mysql -uroot -p0254891276 -h 127.0.0.1 < resin-3.1.12/webapps/${MODELNAME}/WEB-INF/${MODELNAME}_core_src/META-INF/${MODELNAME}_mysql.sql"
+# 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/ && rsync -avz   bizcore/* philip@demo2.doublechaintech.com:~/resin-3.1.12/webapps/${MODELNAME}/
+ssh philip@demo2.doublechaintech.com "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/infrastructure/SensitiveWordFilterService.java

@@ -111,9 +111,19 @@ public int size() {
     private static final char SIGN = '*'; // 敏感词过滤替换
     private SensitiveWordsProvider sensitiveWordsProvider;
     private SensitiveWordsProvider stopWordsProvider;
+    private boolean enabled = true;
+    
+    
 
+    public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
 
-    public void setSensitiveWordsProvider(SensitiveWordsProvider sensitiveWordsProvider) {
+	public void setSensitiveWordsProvider(SensitiveWordsProvider sensitiveWordsProvider) {
         this.sensitiveWordsProvider = sensitiveWordsProvider;
     }
 
@@ -179,6 +189,9 @@ private void addSensitiveWord(final List<String> words) {
      * @return
      */
     public final String doFilter(final String inputSrc) {
+    	if (!isEnabled()) {
+    		return inputSrc;
+    	}
         if (set != null && nodes != null && !TextUtil.isBlank(inputSrc)) {
         	String src = internalReplacement(inputSrc);
             char[] chs = src.toCharArray();

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

@@ -21,5 +21,7 @@ public interface InvocationResult {
 	public boolean isRenderAsJSON();
 
 	public Map<String, String> getResponseHeader();
+	public String getEnvName();
+	public String getEnvType();
 
 }

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

@@ -24,11 +24,30 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 @SuppressWarnings("rawtypes")
 public class ServletResultRenderer {
-
+	
+	protected void renderMimeObjectResult(HttpServlet servlet, InvocationResult result, HttpServletRequest request,
+			HttpServletResponse response) throws IOException {
+		
+		Object actualResult = result.getActualResult();
+		if(!(actualResult instanceof BlobObject)) {
+			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());
+		
+	}
 	public void render(HttpServlet servlet, HttpServletRequest request, HttpServletResponse response,
 			InvocationResult result) throws ServletException, IOException {
 		// When integrate with WeiXin, some special request has accept:*/* , and must render as plainText
 		// so decide render way by result.isRenderByXXX first
+		if(result.getActualResult() instanceof BlobObject) {
+			renderMimeObjectResult(servlet, result, request, response);
+			return;
+		}
 		if (result.isAssignedRenderingWay()){
 			if (result.isRenderAsHtml()){
 				renderHTMLPage(servlet, result, request, response);
@@ -144,6 +163,7 @@ protected boolean hasHeaderWithValue(HttpServletRequest request, String header,
 	}
 	private ObjectMapper objectMapper = null;
 	protected ObjectMapper getObjectMapper(){
+//		objectMapper = null;
 		if(objectMapper == null){
 			objectMapper = new ObjectMapper();
 			//DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -161,7 +181,7 @@ 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");
 
 	}
@@ -178,7 +198,9 @@ 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);
@@ -206,6 +228,7 @@ protected void renderJson(InvocationResult result, HttpServletRequest request, H
 		*/
 		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         mapper.setSerializationInclusion(Include.NON_NULL);
+//        log("Render JSON result: "+ result.getActualResult());
 		String json = mapper.writeValueAsString(result.getActualResult());
 		log("Render JSON result with size: "+ json.length());
 //		log("Render JSON result: "+ json);
@@ -229,6 +252,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) {
@@ -251,6 +276,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/SimpleInvocationResult.java

@@ -87,6 +87,36 @@ public boolean isRenderAsJavaScript() {
 	public boolean isRenderAsJSON() {
 		return InvocationResult.RENDER_AS_JSON.equals(getAssignedRenderingWay());
 	}
-	
-
+	@Override
+	public String getEnvType() {
+		InvocationContext invokeCtx = getInvocationContext();
+		if (invokeCtx == null){
+			return "product";
+		}
+		Object[] params = invokeCtx.getParameters();
+		if (params == null || params.length < 1){
+			return "product";
+		}
+		if (!(params[0] instanceof BaseUserContext)){
+			return "product";
+		}
+		BaseUserContext usrCtx = (BaseUserContext) params[0];
+		return usrCtx.isProductEnvironment()?"product":"test";
+	}
+	@Override
+	public String getEnvName() {
+		InvocationContext invokeCtx = getInvocationContext();
+		if (invokeCtx == null){
+			return "product";
+		}
+		Object[] params = invokeCtx.getParameters();
+		if (params == null || params.length < 1){
+			return "product";
+		}
+		if (!(params[0] instanceof BaseUserContext)){
+			return "product";
+		}
+		BaseUserContext usrCtx = (BaseUserContext) params[0];
+		return usrCtx.getEnvironmentName();
+	}
 }