提交代码

.idea/workspace.xml

@@ -5,10 +5,29 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="b5706414-aab4-4b84-9189-e0bf939b95e1" name="Changes" comment="提交代码">
-      <change beforePath="$PROJECT_DIR$/logs/ruoyi-xxl-job-admin.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/ruoyi-xxl-job-admin.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/sys-console.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys-console.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/sys-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sys-info.log" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/ruoyi-xxl-job-admin.2023-10-20.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/ruoyi-xxl-job-admin.2023-10-21.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/ruoyi-xxl-job-admin.2023-10-22.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/ruoyi-xxl-job-admin.2023-10-23.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/ruoyi-xxl-job-admin.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sys-console.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sys-error.2023-10-20.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sys-error.2023-10-21.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sys-error.2023-10-23.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sys-error.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sys-info.2023-10-20.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sys-info.2023-10-21.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sys-info.2023-10-23.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sys-info.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sys-user.2023-10-20.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sys-user.2023-10-21.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sys-user.2023-10-23.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sys-user.log" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MWarningPileController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MWarningPileController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ruoyi-framework/target/classes/com/ruoyi/framework/config/SecurityConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/classes/com/ruoyi/framework/config/SecurityConfig.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -31,6 +50,9 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/.gitignore" root0="FORCE_HIGHLIGHTING" />
+  </component>
   <component name="JRebelWorkspace">
     <option name="jrebelEnabledAutocompile" value="true" />
   </component>
@@ -40,47 +62,48 @@
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="mavenHome" value="$PROJECT_DIR$/../../../apache-maven-3.9.5" />
+        <option name="mavenHome" value="$PROJECT_DIR$/../../apache-maven-3.9.5" />
         <option name="userSettingsFile" value="D:\apache-maven-3.9.5\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
-  </component>
-  <component name="MavenRunner">
-    <option name="skipTests" value="true" />
+    <option name="enabledProfiles">
+      <list>
+        <option value="dev" />
+      </list>
+    </option>
   </component>
   <component name="ProjectColorInfo">{
   &quot;associatedIndex&quot;: 8
 }</component>
   <component name="ProjectId" id="2X0Ut6U1qBnv9dFdRoDzFZHm0TN" />
-  <component name="ProjectLevelVcsManager">
-    <OptionsSetting value="false" id="Update" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RequestMappingsPanelOrder0": "0",
-    "RequestMappingsPanelOrder1": "1",
-    "RequestMappingsPanelWidth0": "75",
-    "RequestMappingsPanelWidth1": "75",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "git-widget-placeholder": "master",
-    "last_opened_file_path": "D:/project/java/zhendashizheng/ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "com.zeroturnaround.javarebel.idea.plugin.settings.AdvancedConfigurable",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
+    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
+    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
+    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/project/java/zhendashizheng/ruoyi-gas/src/main/java/com/ruoyi/gas&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
   </component>
@@ -89,19 +112,16 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\project\java\zhendashizheng\ruoyi-admin\src\main\java\com\ruoyi\web\controller\mobile" />
-      <recent name="D:\project\java\zhendashizheng" />
       <recent name="D:\project\java\zhendashizheng\ruoyi-gas\src\main\java\com\ruoyi\gas" />
       <recent name="D:\project\java\zhendashizheng\ruoyi-admin\src\main\java\com\ruoyi\web\controller\gas" />
       <recent name="D:\project\java\zhendashizheng\ruoyi-gas\src\main" />
+      <recent name="D:\project\java\zhendashizheng\ruoyi-gas\src\main\resources\mapper" />
+      <recent name="D:\project\java\zhendashizheng\ruoyi-admin\src\main\java\com\ruoyi\web\controller\mobile" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\project\java\zhendashizheng\ruoyi-gas\src\main\resources\mapper" />
       <recent name="D:\project\java\zhendashizheng\ruoyi-gas\src\main\java\com\ruoyi\gas" />
     </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.ruoyi.web.controller.mobile" />
-    </key>
   </component>
   <component name="RunDashboard">
     <option name="configurationTypes">
@@ -154,8 +174,10 @@
       <workItem from="1698201966791" duration="7531000" />
       <workItem from="1698281101623" duration="8631000" />
       <workItem from="1698301838507" duration="2817000" />
-      <workItem from="1698308761171" duration="1767000" />
-      <workItem from="1698367022283" duration="13482000" />
+      <workItem from="1698305258675" duration="3441000" />
+      <workItem from="1698367831757" duration="9548000" />
+      <workItem from="1698392561252" duration="514000" />
+      <workItem from="1698393092941" duration="2170000" />
     </task>
     <task id="LOCAL-00001" summary="提交代码">
       <option name="closed" value="true" />
@@ -183,21 +205,45 @@
     </task>
     <task id="LOCAL-00004" summary="提交代码">
       <option name="closed" value="true" />
-      <created>1698376313155</created>
+      <created>1698306031425</created>
       <option name="number" value="00004" />
       <option name="presentableId" value="LOCAL-00004" />
       <option name="project" value="LOCAL" />
-      <updated>1698376313155</updated>
+      <updated>1698306031425</updated>
     </task>
     <task id="LOCAL-00005" summary="提交代码">
       <option name="closed" value="true" />
-      <created>1698392421241</created>
+      <created>1698308535570</created>
       <option name="number" value="00005" />
       <option name="presentableId" value="LOCAL-00005" />
       <option name="project" value="LOCAL" />
-      <updated>1698392421241</updated>
+      <updated>1698308535570</updated>
+    </task>
+    <task id="LOCAL-00006" summary="提交代码">
+      <option name="closed" value="true" />
+      <created>1698381909877</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1698381909877</updated>
+    </task>
+    <task id="LOCAL-00007" summary="提交代码">
+      <option name="closed" value="true" />
+      <created>1698392475011</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1698392475011</updated>
+    </task>
+    <task id="LOCAL-00008" summary="提交代码">
+      <option name="closed" value="true" />
+      <created>1698392954495</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1698392954495</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MWarningPileController.java

@@ -56,10 +56,10 @@ public class MWarningPileController extends BaseController {
      * 查询警示桩列表
      */
     @ApiOperation("查询警示桩列表")
-    @PreAuthorize("@ss.hasPermi('gas:warningPile:list')")
+    //@PreAuthorize("@ss.hasPermi('gas:warningPile:list')")
     @GetMapping("/getList")
-    public List<GWarningPileVo> getList(@Validated(QueryGroup.class) GWarningPileBo bo) {
-        return iGWarningPileService.getList(bo);
+    public AjaxResult getList(@Validated(QueryGroup.class) GWarningPileBo bo) {
+        return AjaxResult.success(iGWarningPileService.getList(bo)) ;
     }
 
     /**
@@ -78,7 +78,7 @@ public class MWarningPileController extends BaseController {
      * 获取警示桩详细信息
      */
     @ApiOperation("获取警示桩详细信息")
-    @PreAuthorize("@ss.hasPermi('gas:warningPile:query')")
+   // @PreAuthorize("@ss.hasPermi('gas:warningPile:query')")
     @GetMapping("/{id}")
     public AjaxResult<GWarningPileVo> getInfo(@NotNull(message = "主键不能为空")
                                                   @PathVariable("id") Long id) {
@@ -101,9 +101,9 @@ public class MWarningPileController extends BaseController {
      * 修改警示桩
      */
     @ApiOperation("修改警示桩")
-    @PreAuthorize("@ss.hasPermi('gas:warningPile:edit')")
-    @Log(title = "警示桩", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
+    //@PreAuthorize("@ss.hasPermi('gas:warningPile:edit')")
+    //@Log(title = "警示桩", businessType = BusinessType.UPDATE)
+    //@RepeatSubmit()
     @PutMapping()
     public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody GWarningPileBo bo) {
         return toAjax(iGWarningPileService.updateByBo(bo) ? 1 : 0);

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -108,9 +108,10 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                         "/*.html",
                         "/**/*.html",
                         "/**/*.css",
-                        "/**/*.js"
+                        "/**/*.js","/mobile/**/**"
                 ).permitAll()
                 .antMatchers(securityProperties.getAnonymous()).anonymous()
+                .antMatchers("/mobile/**/**").anonymous()
                 .antMatchers(securityProperties.getPermitAll()).permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()