laowo 4 роки тому
батько
коміт
61dcaeecaa

+ 0 - 6
WebRoot/WEB-INF/spring-servlet.xml

@@ -22,12 +22,6 @@ http://www.springframework.org/schema/websocket
             </bean>
         </mvc:message-converters>
     </mvc:annotation-driven>
-
-
-
-
-
-
     <!--启用自动扫描  -->
     <context:component-scan base-package="cn.com.usky.iot.controller"/>
     <!-- 后台任务 -->

+ 2 - 1
WebRoot/view/scripts/log.html

@@ -123,7 +123,8 @@
                             //     prop: "updateTime",
                             //     name: "更新时间"
                     }, ],
-                    url: "http://localhost:8080/YtIoT/iot/log/queryLogList",
+                    //TODO 改成线上地址
+                    url: "http://::1:8080/YtIoT/iot/log/queryLogList",
                     inputList: [
                         //     {
                         //     prop: "unit",

+ 4 - 4
src/cn/com/usky/iot/controller/Log.java

@@ -49,7 +49,7 @@ public class Log {
         if (!isAuth) {
             com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
             json.put("check", false);
-            json.put("errMsg", "权限错误,请重新登录");
+            json.put("errMsg", "鏉冮檺閿欒�锛岃�閲嶆柊鐧诲綍");
             return null;
 
         }
@@ -57,13 +57,13 @@ public class Log {
         String vLoginname = o.getVLoginname();
         Page<SysLogDTO> sysLogDTOPage = logService.queryLogList(pageSize, pageNo, vLoginname);
         //  String s = JSONObject.toJSON(sysLogDTOPage).toString();
-        // 两者缺一不可,缺setCharacterEncoding,则中文变成“???”
-        //缺setContentType,则中文变成“骞夸??...”
+        // 涓よ€呯己涓€涓嶅彲锛岀己setCharacterEncoding锛屽垯涓�枃鍙樻垚鈥�???鈥�
+        //缂簊etContentType锛屽垯涓�枃鍙樻垚鈥滈獮澶�??...鈥�
         //   response.setCharacterEncoding("UTF-8");
 
         //  response.setContentType("text/html");
         //    byte[] utf8Bytes = s.getBytes("UTF-8");
-//然后用utf-8 对这个字节数组解码成新的字符串
+//鐒跺悗鐢╱tf-8 瀵硅繖涓�瓧鑺傛暟缁勮В鐮佹垚鏂扮殑瀛楃�涓�
         //     String utf8Str = new String(utf8Bytes, "UTF-8");