test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-11-30 10:58:14 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix log error

Browse Source
This commit is contained in:
bwcx_jzy 2022-05-30 11:53:14 +08:00
parent cda37ec8bb
commit a2208edd79
No known key found for this signature in database
GPG Key ID: 5E48E9372088B9E5
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/agent/src/test/java/TestStr.java
View File

@ -20,7 +20,6 @@
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
import cn.hutool.core.lang.PatternPool; import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.lang.RegexPool; import cn.hutool.core.lang.RegexPool;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;

2
modules/server/src/main/java/io/jpom/service/h2db/BaseDbService.java
View File

@ -431,7 +431,7 @@ public abstract class BaseDbService<T extends BaseDbModel> extends BaseDbCommonS
} catch (java.lang.IllegalStateException illegalStateException) { } catch (java.lang.IllegalStateException illegalStateException) {
return 0L; return 0L;
} catch (Exception e) { } catch (Exception e) {
DefaultSystemLog.getLog().error("查询数据错误 ：{}", e.getMessage()); DefaultSystemLog.getLog().error("查询数据错误", e);
return 0L; return 0L;
} }
if (pageResult.isEmpty()) { if (pageResult.isEmpty()) {

2
modules/sub-plugin/git-clone/src/main/java/io/jpom/plugin/GitUtil.java
View File

@ -135,7 +135,7 @@ public class GitUtil {
private static void setCredentials(TransportCommand<?, ?> transportCommand, Map<String, Object> parameter) { private static void setCredentials(TransportCommand<?, ?> transportCommand, Map<String, Object> parameter) {
Integer protocol = (Integer) parameter.get("protocol"); Integer protocol = (Integer) parameter.get("protocol");
String username = (String) parameter.get("username"); String username = (String) parameter.get("username");
String password = (String) parameter.get("password"); String password = StrUtil.emptyToDefault((String) parameter.get("password"), StrUtil.EMPTY);
if (protocol == 0) { if (protocol == 0) {
// http // http
UsernamePasswordCredentialsProvider credentialsProvider = new UsernamePasswordCredentialsProvider(username, password); UsernamePasswordCredentialsProvider credentialsProvider = new UsernamePasswordCredentialsProvider(username, password);

1
pom.xml
View File

@ -38,6 +38,7 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.7</version> <version>2.6.7</version>
<relativePath />
</parent> </parent>
<groupId>io.jpom</groupId> <groupId>io.jpom</groupId>
<artifactId>jpom-parent</artifactId> <artifactId>jpom-parent</artifactId>