合并分支 'dev' 到 'master'

Dev

查看合并请求 !36

SLN/%PUBPRJ%-app/%PUBPRJ%-app-%APP_PKGPATH%/src/main/java/%SYS_PKGPATH%/%APP_PKGPATH%/config/%APP%SecurityConfig.java.ftl

@@ -56,6 +56,9 @@ public class ${app.getPKGCodeName()}SecurityConfig extends WebSecurityConfigurer
 
     @Value("${r'${ibiz.file.previewpath:ibizutil/preview}"'})
     private String previewpath;
+    
+    @Value("${r'${ibiz.auth.excludesPattern:}"'})
+    private String[] excludesPattern;
 
     @Autowired
     public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
@@ -119,9 +122,15 @@ public class ${app.getPKGCodeName()}SecurityConfig extends WebSecurityConfigurer
                 // 文件操作
                 .antMatchers("/"+downloadpath+"/**").permitAll()
                 .antMatchers("/"+uploadpath).permitAll()
-                .antMatchers("/"+previewpath+"/**").permitAll()
-                // 所有请求都需要认证
-                .anyRequest().authenticated()
+                .antMatchers("/"+previewpath+"/**");
+
+        for (String excludePattern : excludesPattern) {
+            authenticationTokenFilter.addExcludePattern(excludePattern);
+            httpSecurity.authorizeRequests().antMatchers(excludePattern).permitAll();
+        }
+
+        // 所有请求都需要认证
+        httpSecurity.authorizeRequests().anyRequest().authenticated()
                 // 防止iframe 造成跨域
                 .and().headers().frameOptions().disable();
 

SLN/%PUBPRJ%-boot/src/main/resources/application-dev.yml.ftl

@@ -60,10 +60,10 @@ zuul:
         </#if>
     </#list>
     <#if haswfentity==true>
-      wfcore:
-        path: /wfcore/**
-        serviceId: ${r'${ibiz.ref.service.wf:ibzwf-api}'}
-        stripPrefix: true
+    wfcore:
+      path: /wfcore/**
+      serviceId: ${r'${ibiz.ref.service.wf:ibzwf-api}'}
+      stripPrefix: true
     </#if>
     <#if sys.getPSSystemSetting()?? && sys.getPSSystemSetting().getDataAccCtrlArch()?? && sys.getPSSystemSetting().getDataAccCtrlArch()==1>
     loginv7:

SLN/%PUBPRJ%-core/src/main/resources/workflow/%ITEM%.bpmn.ftl

@@ -205,17 +205,17 @@ TARGET=PSWFVERSION
                          </#if>
      <userTask flowable:category="${r'${businessKey}'}"  flowable:candidateUsers="${assignCond}" flowable:exclusive="true" id="tid-${WFProcess.getWFStepValue()}-${WFProcess.getDeployId()}" name="${WFProcess.getName()}" <#if WFProcess.getWFProcessType()?? && (WFProcess.getWFProcessType()=="CALLORGACTIVITY" || WFProcess.getWFProcessType()=="EMBED")>flowable:formKey="${WFProcess.getWFProcessType()}"</#if>><#comment>标记子流程节点</#comment>
         <documentation>${r'${majortext}'}</documentation>
-         <#if WFProcess.isSendInform()>
-            <#assign msgTempl=WFProcess.getPSSysMsgTempl()>
-            <extensionElements>
-                <flowable:formProperty id="${msgTempl.getCodeName()?lower_case}"  name="${msgTempl.getName()}" variable="${assignGroupCond}" type="${WFProcess.getMsgType()}" />
-            </extensionElements>
+         <#if (WFProcess.isSendInform()?? && WFProcess.getPSSysMsgTempl()?? ) ||  ((WFProcess.getFormCodeName())!'')!='' || ((WFProcess.getMobFormCodeName())!'')!=''  >
+         <#assign msgTempl=WFProcess.getPSSysMsgTempl()>
+         <extensionElements>
+         <#if (WFProcess.isSendInform()?? && WFProcess.getPSSysMsgTempl()?? )>
+         <flowable:formProperty id="${msgTempl.getCodeName()?lower_case}"  name="${msgTempl.getName()}" variable="${assignGroupCond}" type="${WFProcess.getMsgType()}" />
+         </#if>
+         <#if ((WFProcess.getFormCodeName())!'')!='' || ((WFProcess.getMobFormCodeName())!'')!='' >
+         <flowable:form <#if ((WFProcess.getFormCodeName())!'')!=''>process-form="${WFProcess.getFormCodeName()}"</#if><#if ((WFProcess.getMobFormCodeName())!'')!=''> process-mobform="${WFProcess.getMobFormCodeName()}"</#if>/>
+         </#if>
+         </extensionElements>
          </#if>
-        <#--<#if assignGroupCond!="">-->
-        <#--<extensionElements>-->
-             <#--<flowable:field name="assignGroups"><flowable:string>${assignGroupCond}</flowable:string></flowable:field>-->
-        <#--</extensionElements>-->
-        <#--</#if>-->
         <#comment>多实例节点</#comment>
         <#if WFProcess.getMultiInstMode?? && WFProcess.getMultiInstMode()?? && ( WFProcess.getMultiInstMode()=='PARALLEL' || WFProcess.getMultiInstMode()=='SEQUENTIAL')>
          <multiInstanceLoopCharacteristics flowable:collection="candidateUsersList" flowable:elementVariable="candidateUsers" ${isSequential}>
@@ -264,9 +264,14 @@ TARGET=PSWFVERSION
                 <#assign LinkCond="<![CDATA[$\{sequenceFlowId==\""+flowId+"\"}]]>">
             </#if>
             <#if LinkCond!="">
-            <conditionExpression  xsi:type="tFormalExpression" >${LinkCond}</conditionExpression>
+        <conditionExpression  xsi:type="tFormalExpression" >${LinkCond}</conditionExpression>
             </#if>
         </#if>
+         <#if ((WFLink.getFormCodeName())!'')!='' || ((WFLink.getMobFormCodeName())!'')!=''  || ((WFLink.getViewCodeName())!'')!=''  ||  ((WFLink.getMobViewCodeName())!'')!='' >
+         <extensionElements>
+             <flowable:form <#if ((WFLink.getFormCodeName())!'')!=''>sequenceFlowForm="${WFLink.getFormCodeName()}"</#if><#if ((WFLink.getMobFormCodeName())!'')!=''> sequenceFlowMobForm="${WFLink.getMobFormCodeName()}"</#if><#if ((WFLink.getViewCodeName())!'')!=''> sequenceFlowView="${WFLink.getViewCodeName()}"</#if><#if ((WFLink.getMobViewCodeName())!'')!=''> sequenceFlowMobView="${WFLink.getMobViewCodeName()}"</#if>/>
+         </extensionElements>
+         </#if>
      </sequenceFlow>
               </#list>
           </#if>

SLN/%PUBPRJ%-provider/%PUBPRJ%-provider-%SYSAPI_PKGPATH%/src/main/java/%SYS_PKGPATH%/%SYSAPI_PKGPATH%/rest/%ITEM%Resource.java.ftl

@@ -140,12 +140,7 @@ public class ${itemCodeName}Resource {
     <#if item.getPSDEServiceAPIMethods()??>
         <#list item.getPSDEServiceAPIMethods() as apiMethod>
             <#assign reqMtd = apiMethod.getRequestMethod()>
-            <#assign statusCode = "">
-            <#if reqMtd == "POST" >
-                <#assign statusCode = "HttpStatus.CREATED" >
-            <#else>
-                <#assign statusCode = "HttpStatus.OK" >
-            </#if>
+            <#assign statusCode = "HttpStatus.OK">
             <#if apiMethod.getActionType()=='DEACTION'>
                 <#assign deaction = apiMethod.getPSDEAction()>
                 <#assign deactionName = deaction.getName()>