修改

.editorconfig

@@ -0,0 +1,4 @@
+root = true
+
+[*]
+charset = utf-8

src/com/mes/ui/DataUtil.java

@@ -290,10 +290,10 @@ public class DataUtil {
             connection.setReadTimeout(60000);
             connection.setDoOutput(true);
             connection.setDoInput(true);
-            connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+            connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
             connection.setRequestProperty("Authorization", "Bearer da3efcbf-0845-4fe3-8aba-ee040be542c0");
             os = connection.getOutputStream();
-            os.write(param.getBytes());
+            os.write(param.getBytes("UTF-8"));
             if (connection.getResponseCode() == 200) {
                 is = connection.getInputStream();
                 br = new BufferedReader(new InputStreamReader(is, "UTF-8"));

src/com/mes/ui/LoginFarme.java

@@ -10,6 +10,8 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 
 public class LoginFarme extends JFrame {
     //登录模块组件
@@ -44,11 +46,11 @@ public class LoginFarme extends JFrame {
         userPasswordLabel.setBounds(300, 150, 120, 40);
         userPasswordLabel.setFont(new java.awt.Font("Dialog",   1,   16));
         userNameTxt = new JTextField(20);
-        userNameTxt.setText("system");
+        userNameTxt.setText("");
         userNameTxt.setBounds(400, 105, 150, 30);
         userPasswordTxt = new JPasswordField(20);
         userPasswordTxt.setBounds(400, 155, 150, 30);
-        userPasswordTxt.setText("Aa111111");
+        userPasswordTxt.setText("");
         loginButton.setFont(new java.awt.Font("Dialog",   1,   16));
         loginButton.setBounds(300, 200, 255, 40);
         loginButton.setIcon(new ImageIcon(MesClient.class.getResource("/bg/user.png")));
@@ -96,8 +98,8 @@ public class LoginFarme extends JFrame {
             JOptionPane.showMessageDialog(MesClient.mesClientFrame,"用户名或密码不能为空","提示窗口", JOptionPane.INFORMATION_MESSAGE);
             return;
         }
-        String username = Base64Utils.getBase64(user_str);
-        String password = Base64Utils.getBase64(password_str);
+        String username = urlEncode(Base64Utils.getBase64(user_str));
+        String password = urlEncode(Base64Utils.getBase64(password_str));
         System.out.println("&username=" + username + "&password=" + password);
         String url = "http://"+MesClient.mes_server_ip+":8980/js/a/login?__ajax=json&username="+username+"&password="+password+"&validCode=&__sid=";
         String loginResult = HttpUtils.sendRequest(url);
@@ -124,7 +126,7 @@ public class LoginFarme extends JFrame {
         String scanContent = JOptionPane.showInputDialog(null, "请扫码工牌二维码");
         System.out.println("scanContent="+scanContent);
         if(scanContent!=null&&!scanContent.equalsIgnoreCase("")) {
-            String url = "http://"+MesClient.mes_server_ip+":8980/js/a/mes/mesLogin/login?__login=true&__ajax=json&username="+scanContent;
+            String url = "http://"+MesClient.mes_server_ip+":8980/js/a/mes/mesLogin/login?__login=true&__ajax=json&username="+urlEncode(scanContent);
             String loginResult = HttpUtils.sendRequest(url);
             System.out.println("loginResult="+loginResult);
             if(loginResult.equalsIgnoreCase("false")) {
@@ -156,7 +158,7 @@ public class LoginFarme extends JFrame {
         MesClient.sessionid = retObj.get("sessionid").toString();
         if(MesClient.sessionid!=null&&!MesClient.sessionid.equalsIgnoreCase("")) {
             //请求权限
-            String url_authority = "http://"+MesClient.mes_server_ip+":8980/js/a/mes/mesLineProcess/userAuth?__ajax=json&type=0&__sid="+MesClient.sessionid+"&oprno="+MesClient.mes_gw+"&lineSn="+MesClient.mes_line_sn;
+            String url_authority = "http://"+MesClient.mes_server_ip+":8980/js/a/mes/mesLineProcess/userAuth?__ajax=json&type=0&__sid="+urlEncode(MesClient.sessionid)+"&oprno="+urlEncode(MesClient.mes_gw)+"&lineSn="+urlEncode(MesClient.mes_line_sn);
             String authorityResult = HttpUtils.sendRequest(url_authority);
             System.out.println("authorityResult="+authorityResult);
             JSONObject authorityObj = JSONObject.parseObject(authorityResult);
@@ -181,14 +183,14 @@ public class LoginFarme extends JFrame {
                     MesClient.startGetCurSn();
 
                     if(MesClient.jfxPanel == null){
-                        String url = "http://"+ MesClient.mes_server_ip+":8980/js/a/mes/mesProductRecord/work?__sid="+MesClient.sessionid+"&oprno="+MesClient.mes_gw+"&lineSn="+MesClient.mes_line_sn;
+                        String url = "http://"+ MesClient.mes_server_ip+":8980/js/a/mes/mesProductRecord/work?__sid="+urlEncode(MesClient.sessionid)+"&oprno="+urlEncode(MesClient.mes_gw)+"&lineSn="+urlEncode(MesClient.mes_line_sn);
                         MesClient.jfxPanel = new MesWebView(url);
                         MesClient.jfxPanel.setSize(990, 550);
                         MesClient.indexPanelB.add(MesClient.jfxPanel);
                     }
 
                     if(MesClient.jfxPanel2 == null){
-                        String url = "http://"+ MesClient.mes_server_ip+":8980/js/a/mes/mesProcessCheckRecord/ulist?__sid="+MesClient.sessionid+"&oprno="+MesClient.mes_gw+"&lineSn="+MesClient.mes_line_sn;
+                        String url = "http://"+ MesClient.mes_server_ip+":8980/js/a/mes/mesProcessCheckRecord/ulist?__sid="+urlEncode(MesClient.sessionid)+"&oprno="+urlEncode(MesClient.mes_gw)+"&lineSn="+urlEncode(MesClient.mes_line_sn);
                         MesClient.jfxPanel2 = new MesWebView(url);
                         MesClient.jfxPanel2.setSize(990, 550);
                         MesClient.indexPanelC.add(MesClient.jfxPanel2);
@@ -204,4 +206,12 @@ public class LoginFarme extends JFrame {
             return;
         }
     }
+
+    private static String urlEncode(String value) {
+        try {
+            return URLEncoder.encode(value == null ? "" : value, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

src/com/mes/ui/MesClient.java

@@ -105,13 +105,13 @@ public class MesClient extends JFrame {
 
     public static Timer cjTimer3;
 
-    public static Short aSetNum = 40;
+    public static Short aSetNum = 41;
 //    public static Short aSetNum = 49;
     public static Short sortA = 0;
     public static Short aMax = 0;
     public static Short aFinish = 0;
     public static List<Map> alist = new ArrayList<>();
-    public static Short bSetNum = 22;
+    public static Short bSetNum = 14;
 //    public static Short bSetNum = 27;
     public static Short sortB = 0;
     public static Short bMax = 0;
@@ -276,8 +276,8 @@ public class MesClient extends JFrame {
             System.out.println("加载本地配置成功：aSetNum=" + aSetNum + ", bSetNum=" + bSetNum + ", plcA=" + curIpA + ", plcB=" + curIpB);
         } else {
             // 兜底默认值
-            aSetNum = 40;
-            bSetNum = 22;
+            aSetNum = 41;
+            bSetNum = 14;
             curIpA = "192.168.1.7";
             curIpB = "192.168.1.8";
             plcA = new ModbusTcp(1, curIpA);

src/com/mes/util/Base64Utils.java

@@ -2,14 +2,16 @@ package com.mes.util;
 
 import org.apache.commons.codec.binary.Base64;
 
+import java.nio.charset.StandardCharsets;
+
 public class Base64Utils {
 	public static String getBase64(String str) {
-		// 待编码的二进制数据
-        byte[] binaryData = str.getBytes();
-        // 使用Base64.encodeBase64String进行编码
+		// 待编码的二进制数据
+        byte[] binaryData = str.getBytes(StandardCharsets.UTF_8);
+        // 浣跨敤Base64.encodeBase64String杩涜�缂栫爜
         String encodedString = Base64.encodeBase64String(binaryData);
-        // 输出编码后的结果
-        System.out.println("Base64编码结果： " + encodedString);
+        // 杈撳嚭缂栫爜鍚庣殑缁撴灉
+        System.out.println("Base64编码结果： " + encodedString);
         return encodedString;
 	}
 }

src/com/mes/util/DateLocalUtils.java

@@ -18,14 +18,14 @@ public class DateLocalUtils {
 		return currentTime;
 	}
 	
-	//获取当前时间，年月日
+	//鑾峰彇褰撳墠鏃堕棿锛屽勾鏈堟棩
 	public static SimpleDateFormat DATA_FORMAT2 = new SimpleDateFormat("yyyy-MM-dd");
 	public static String getCurrentDate() {
 		String currentTime = DATA_FORMAT2.format(new Date());
 		return currentTime;
 	}
 	
-	//获取当前时间，时分秒
+	//鑾峰彇褰撳墠鏃堕棿锛屾椂鍒嗙�
 	public static SimpleDateFormat DATA_FORMAT3 = new SimpleDateFormat("HH:mm:ss");
 	public static String getCurrentTimeHMS() {
 		String currentTime = DATA_FORMAT3.format(new Date());

src/com/mes/util/HttpUtils.java

@@ -30,7 +30,7 @@ public class HttpUtils {
             //设置请求类型
             con.setRequestMethod(requestType);
             //设置请求需要返回的数据类型和字符集类型
-            con.setRequestProperty("Content-Type", "application/json;charset=GBK");  
+            con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
             //允许写出
             con.setDoOutput(true);
             //允许读入
@@ -83,7 +83,7 @@ public class HttpUtils {
             //设置请求类型
             con.setRequestMethod(requestType);
             //设置请求需要返回的数据类型和字符集类型
-            con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=GBK");
+            con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
             //允许写出
             con.setDoOutput(true);
             //允许读入

src/com/mes/util/JdbcUtils.java

@@ -135,9 +135,8 @@ public class JdbcUtils {
 		ResultSet rs = statement.executeQuery("SELECT count(*) FROM bw_rivet_param");
 		if (rs.next() && rs.getInt(1) == 0) {
 			statement.executeUpdate("INSERT INTO bw_rivet_param (gun_type,start_rivet,end_rivet,f_min,f_max,s_min,s_max,sort_order) VALUES "
-					+ "('A',1,4,0,0,2000,4000,1),"
-					+ "('A',5,40,0,0,2000,5000,2),"
-					+ "('B',1,22,0,0,2500,4500,1)");
+					+ "('A',1,41,10000,12000,3500,5500,1),"
+					+ "('B',1,14,11000,13000,3500,5500,1)");
 		}
 		rs.close();
 		System.out.println("表rivet_param创建并初始化成功！");