使用推荐的字符流转换方法

pom.xml

@@ -58,6 +58,12 @@
 			<version>${apachelog4j.version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> 
 			<artifactId>log4j-core</artifactId> <version>${apachelog4j.version}</version> 
 			</dependency> -->
+		<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.14</version>
+		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>

src/main/java/com/archser/aserver/controller/IndexController.java

@@ -35,7 +35,6 @@ import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.redis.Redis;
 import com.spbportal.sso.SsoToken;
-
 import io.jsonwebtoken.JwsHeader;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -149,7 +148,7 @@ public class IndexController extends Controller {
 		// 一旦开启三员 admin用户不能使用
 		if ("admin".equals(user.getUsername())) {
 			Integer userCount = Db.queryInt(Db.getSql("hasThreeMemberUsersCount"));
-			boolean isExistThreeMemberUsers = userCount == null ? false : (userCount.intValue() > 0 ? true : false);
+			boolean isExistThreeMemberUsers = userCount == null ? false : (userCount > 0 ? true : false);
 			if (isExistThreeMemberUsers) {
 				this.renderJson(Ret.fail("msg", "已开启三员管理，admin失效了。"));
 				logService.saveAsLog("login", username, JwtInterceptor.getIpAddr(getRequest()), "登录失败,原因:已开启三员管理", app);
@@ -198,8 +197,7 @@ public class IndexController extends Controller {
 
 		if (!"admin".equals(user.getUsername())) {
 			Integer noLockedRolesCount = Db.queryInt(Db.getSql("hasNoLockedRolesCount"), user.getUsername());
-			boolean noLockedRolesFlag = noLockedRolesCount == null ? false
-					: (noLockedRolesCount.intValue() > 0 ? true : false);
+			boolean noLockedRolesFlag = noLockedRolesCount == null ? false : (noLockedRolesCount.intValue() > 0 ? true : false);
 			if (!noLockedRolesFlag) {
 				this.renderJson(Ret.fail("msg", "拥有的角色全部被锁定，不能登录系统了。"));
 				logService.saveAsLog("login", username, JwtInterceptor.getIpAddr(getRequest()), "登录失败,原因:该用户拥有的角色全部被锁定",

src/main/java/com/archser/aserver/controller/SettingController.java

@@ -7,7 +7,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Arrays;
-import java.util.Base64;
 import java.util.List;
 import java.util.Objects;
 import com.archser.aserver.interceptor.JwtInterceptor;
@@ -24,6 +23,8 @@ import com.jfinal.kit.Ret;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.tx.Tx;
 import com.jfinal.upload.UploadFile;
+import org.apache.xerces.impl.dv.util.Base64;
+import sun.misc.BASE64Encoder;
 
 /**
  * 应用全局设置
@@ -137,18 +138,8 @@ public class SettingController extends Controller {
     }
     // 对字节数组Base64编码
     // 返回Base64编码过的字节数组字符串
-    return Arrays.toString(Base64.getEncoder().encode(Objects.requireNonNull(data)));
+    return  Base64.encode(data);
   }
-  // public void logoUrl() {
-  // String val = null;
-  // try {
-  // val = this.getConfig("logoUrl");
-  // } catch (Exception e) {
-  // this.renderJson(Ret.fail("msg", e.getMessage()));
-  // }
-  // this.renderJson(Ret.ok("logoUrl", val));
-  // }
-
 
   public void getServerName() {
     String val = null;
@@ -281,8 +272,7 @@ public class SettingController extends Controller {
       return false;
     try {
         // Base64解码
-//        byte[] bytes = decoder.decodeBuffer(logoUrl);
-      byte[] bytes = Base64.getDecoder().decode(logoUrl);
+      byte[] bytes = Base64.decode(logoUrl);
         for (int i = 0; i < bytes.length; ++i) {
             if (bytes[i] < 0) {// 调整异常数据
                 bytes[i] += 256;

src/main/java/com/archser/aserver/controller/UserController.java

@@ -17,6 +17,7 @@ import com.jfinal.kit.Ret;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.redis.Redis;
+import org.apache.commons.codec.binary.Base64;
 
 /**
  * 用户相关操作
@@ -199,7 +200,7 @@ public class UserController extends Controller {
 
 
   public String image2Base64(byte[] image) {
-    return String.valueOf(Base64.getEncoder().encode(image));
+      return  Base64.encodeBase64String(image);
   }
 
 }