drew 5 anni fa
parent
commit
5b1ef483ba

+ 1 - 0
src/main/java/com/izouma/awesomeAdmin/security/WebSecurityConfig.java

@@ -63,6 +63,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/v2/api-docs", "/swagger-ui.html", "/swagger-resources/**", "/webjars/**").permitAll()
                 .antMatchers("/user/register").permitAll()
                 .antMatchers("/upload/**").permitAll()
+                .antMatchers("/files/**").permitAll()
                 .antMatchers("/static/**").permitAll()
                 .antMatchers("/auth/**").permitAll()
                 .antMatchers("/admin/**").permitAll()

+ 6 - 6
src/main/vue/src/components/CoordPick.vue

@@ -70,15 +70,15 @@ export default {
                     self.$refs.map.$$getInstance().setDefaultCursor('default');
                 },
                 click(e) {
-                    self.marker = [e.lnglat.O, e.lnglat.P];
-                    self.mapCenter = [e.lnglat.O, e.lnglat.P];
+                    self.marker = [e.lnglat.lng, e.lnglat.lat];
+                    self.mapCenter = [e.lnglat.lng, e.lnglat.lat];
                     self.getGeolocation();
                 }
             },
             markerEvents: {
                 dragend(e) {
-                    self.marker = [e.lnglat.O, e.lnglat.P];
-                    self.mapCenter = [e.lnglat.O, e.lnglat.P];
+                    self.marker = [e.lnglat.lng, e.lnglat.lat];
+                    self.mapCenter = [e.lnglat.lng, e.lnglat.lat];
                     self.getGeolocation();
                 }
             },
@@ -104,8 +104,8 @@ export default {
             geolocation.getCurrentPosition();
             AMap.event.addListener(geolocation, 'complete', data => {
                 this.locating = false;
-                this.mapCenter = [data.position.O, data.position.P];
-                this.myPosition = [data.position.O, data.position.P];
+                this.mapCenter = [data.position.lng, data.position.lat];
+                this.myPosition = [data.position.lng, data.position.lat];
             });
             AMap.event.addListener(geolocation, 'error', err => {
                 this.locating = false;

+ 4 - 1
src/main/vue/src/components/CropUpload.vue

@@ -12,13 +12,14 @@
             trigger="#upload-wrapper"
             :cropper-options="cropperOptions"
             :output-options="outputOptions"
-            :upload-url="$baseUrl + '/upload/file'"
+            :upload-url="uploadUrl"
             :labels="{ submit: '确定', cancel: '取消' }"
             :upload-headers="headers"
         />
     </div>
 </template>
 <script>
+import resolveUrl from 'resolve-url';
 import AvatarCropper from 'vue-avatar-cropper';
 
 export default {
@@ -34,6 +35,7 @@ export default {
         }
     },
     created() {
+        this.uploadUrl = resolveUrl(this.$baseUrl, 'upload/file');
         if (this.value) {
             this.src = this.value;
         }
@@ -46,6 +48,7 @@ export default {
     },
     data() {
         return {
+            uploadUrl: '',
             src: '',
             cropperOptions: {
                 aspectRatio: 1