Merge remote-tracking branch 'origin/dev' into dev

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/rest/AppController.java.ftl

@@ -11,23 +11,29 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Value;
 import ${pub.getPKGCodeName()}.util.security.AuthenticationUser;
 
 @RestController
 @RequestMapping(value = "")
 public class AppController {
 
+	@Value("${r'${ibiz.enablePermissionValid:false}'}")
+    boolean enablePermissionValid;  //是否开启权限校验
+
 	@RequestMapping(method = RequestMethod.GET, value = "/appdata")
 	public ResponseEntity<JSONObject> getAppData() {
 
 		JSONObject appData = new JSONObject() ;
 		JSONArray uniRes=new JSONArray();
-		JSONObject userPermission=AuthenticationUser.getAuthenticationUser().getPermissionList();
-		if(!ObjectUtils.isEmpty(userPermission)){
-			uniRes = userPermission.getJSONArray("unires");
+		if(enablePermissionValid){
+			JSONObject userPermission=AuthenticationUser.getAuthenticationUser().getPermissionList();
+			if(!ObjectUtils.isEmpty(userPermission)){
+				uniRes = userPermission.getJSONArray("unires");
+			}
 		}
 		appData.put("unires",uniRes);
+		appData.put("enablepermissionvalid",enablePermissionValid);
 		return ResponseEntity.status(HttpStatus.OK).body(appData);
 	}
-
 }