我们已经从“ master”创建了“ dev”分支,并一直在开发“ dev”分支。我们还没有将'dev'合并到'master'。同样,我们同时从“ master”创建了“ preprod”分支,并致力于“ preprod”分支的更改。我们尚未将'preprod'合并为'master'。
现在,我们试图实现的是将“ preprod”更改单独合并为“ dev”。我尝试通过Gitlab创建合并请求并批准了该请求。我发现,“ dev”代码中的更改也移至“ preprod”,反之亦然。我不希望将“ dev”更改转移到“ preprod”。我怎样才能做到这一点?
我尝试添加
\n\n <enforce-valid-basic-auth-credentials>false</enforce-valid-basic-auth-credentials>\nRun Code Online (Sandbox Code Playgroud)\n\n在 weblogic 服务器 12.1.3 的 config.xml 中的标签内<security-configuration>添加此行后,每当我启动服务器时,我的 weblogic 服务器都会关闭。
有什么不对?我已在下面附上我的 config.xml 内容
\n\n <domain-version>12.1.3.0.0</domain-version>\n <security-configuration>\n <name>mdm_domain</name>\n <realm>\n <sec:authentication-provider xsi:type="wls:default-authenticatorType">\n <sec:name>DefaultAuthenticator</sec:name>\n </sec:authentication-provider>\n <sec:authentication-provider xsi:type="wls:default-identity-asserterType">\n <sec:name>DefaultIdentityAsserter</sec:name>\n <sec:active-type>AuthenticatedUser</sec:active-type>\n </sec:authentication-provider>\n <sec:role-mapper xmlns:xac="http://xmlns.oracle.com/weblogic/security/xacml" xsi:type="xac:xacml-role-mapperType">\n <sec:name>XACMLRoleMapper</sec:name>\n </sec:role-mapper>\n <sec:authorizer xmlns:xac="http://xmlns.oracle.com/weblogic/security/xacml" xsi:type="xac:xacml-authorizerType">\n <sec:name>XACMLAuthorizer</sec:name>\n </sec:authorizer>\n <sec:adjudicator xsi:type="wls:default-adjudicatorType">\n <sec:name>DefaultAdjudicator</sec:name>\n </sec:adjudicator>\n <sec:credential-mapper xsi:type="wls:default-credential-mapperType">\n <sec:name>DefaultCredentialMapper</sec:name>\n </sec:credential-mapper>\n <sec:cert-path-provider xsi:type="wls:web-logic-cert-path-providerType">\n <sec:name>WebLogicCertPathProvider</sec:name>\n </sec:cert-path-provider>\n <sec:cert-path-builder>WebLogicCertPathProvider</sec:cert-path-builder>\n <sec:name>myrealm</sec:name>\n <sec:password-validator xmlns:pas="http://xmlns.oracle.com/weblogic/security/providers/passwordvalidator" xsi:type="pas:system-password-validatorType">\n <sec:name>SystemPasswordValidator</sec:name>\n <pas:min-password-length>8</pas:min-password-length>\n <pas:min-numeric-or-special-characters>1</pas:min-numeric-or-special-characters>\n </sec:password-validator>\n </realm>\n <default-realm>myrealm</default-realm>\n <credential-encrypted>{AES}lWxYlHpEqfbODbLmeerJr6H86R6+lvszW466UpoYzuyh6X617HokRf/oKl3cZJM+JTXliBWwXFhAiC9G3JrbxYNBkXMUGqFSOicuMVJVD0tTCuTr6sfY7UPK9M40Vi4n</credential-encrypted>\n <node-manager-username>weblogic</node-manager-username>\n <node-manager-password-encrypted>{AES}loTlWUtqsyw7sq4ujEhLVDaHCv/s7k22k0KSacFO/Ww=</node-manager-password-encrypted>\n <enforce-valid-basic-auth-credentials>false</enforce-valid-basic-auth-credentials>\xc2\xa0\n </security-configuration>\nRun Code Online (Sandbox Code Playgroud)\n