发布版本

src/main/java/com/izouma/awesomeadmin/service/OSSFileService.java

@@ -8,6 +8,8 @@ import com.izouma.awesomeadmin.util.PropertiesFileLoader;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -32,7 +34,7 @@ public class OSSFileService {
     private static Logger logger = Logger.getLogger(OSSFileService.class);
     private static final String projectName = PropertiesFileLoader.getProperties("projectname");
 
-    public String upload(InputStream fin, String path) {
+    public String uploadOss(InputStream fin, String path) {
         if (path.startsWith("/")) {
             path = path.replaceFirst("\\\\/", "");
         }
@@ -60,11 +62,49 @@ public class OSSFileService {
     }
 
 
+    public String upload(InputStream fin, String imageName) {
+
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+
+        String uploadPath = request.getSession().getServletContext().getRealPath(projectName);
+
+        String imgUrlPath = "";
+
+
+        try {
+
+
+            File file = new File(uploadPath + "/" + imageName.split("/")[0]);
+            if (!file.exists()&&!file.isDirectory())
+                file.mkdirs();
+
+            InputStream in = fin;
+            OutputStream out = new FileOutputStream(uploadPath + "/" + imageName, true);
+            byte b[] = new byte[1024];
+            int len = 0;
+            while ((len = in.read(b)) != -1) {
+                out.write(b, 0, len);
+            }
+            in.close();
+            out.close();
+            System.out.println("存入照片：" + uploadPath + "/" + imageName);
+            imgUrlPath = projectName + "/" + imageName;
+        } catch (Exception r) {
+            logger.error("OSS上传异常:", r);
+        }
+        // 如果不设置content-length, 默认为chunked编码。
+        if (imgUrlPath != null) {
+            return getFullPath(imgUrlPath);
+        }
+        return null;
+    }
+
+
     private static String getFullPath(String Path) {
         if (Path == null || "".equals(Path)) {
             return Path;
         }
-        String aliossendpoit = PropertiesFileLoader.getDefaultProperties("aliImageSever", "");
+        String aliossendpoit = PropertiesFileLoader.getDefaultProperties("base_domain", "");
         return aliossendpoit + "/" + Path;
     }
 

src/main/java/com/izouma/awesomeadmin/service/impl/UserInfoServiceImpl.java

@@ -15,7 +15,6 @@ import io.jsonwebtoken.Jwt;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;
 import io.rong.RongCloud;
-import io.rong.models.SMSVerifyCodeResult;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONException;

src/main/java/com/izouma/awesomeadmin/web/AssetsController.java

@@ -2,6 +2,7 @@ package com.izouma.awesomeadmin.web;
 
 import com.izouma.awesomeadmin.dto.Result;
 import com.izouma.awesomeadmin.service.OSSFileService;
+import com.izouma.awesomeadmin.util.PropertiesFileLoader;
 import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -30,9 +31,11 @@ public class AssetsController {
     @Autowired
     private OSSFileService OSSFileService;
 
+    private static final String projectName = PropertiesFileLoader.getProperties("projectname");
+
     @RequestMapping(value = "/uploadImg", method = RequestMethod.POST)
     @ResponseBody
-    public Result uploadImg(@RequestParam("base64") String base64) {
+    public Result uploadImg(@RequestParam("base64") String base64, HttpServletRequest request) {
 
         try {
             String path = OSSFileService.uploadImg(base64);
@@ -46,6 +49,9 @@ public class AssetsController {
     @RequestMapping(value = "/uploadFile")
     @ResponseBody
     public Result uploadFile(HttpServletRequest request) {
+
+        String uploadPath = request.getSession().getServletContext().getRealPath(projectName);
+
         CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(request.getSession().getServletContext());
         if (multipartResolver.isMultipart(request)) {
             MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
@@ -62,8 +68,10 @@ public class AssetsController {
                         }
                         String ext = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
                         String fileType = file.getContentType().substring(0, file.getContentType().indexOf("/"));
-                        String uploadPath = String.format("%s/%s-%s%s", fileType, new SimpleDateFormat("yyyy-MM-dd-hh-mm-ss").format(new Date()), randomCode, ext);
-                        String path = OSSFileService.upload(file.getInputStream(), uploadPath);
+                        String imageName = String.format("%s/%s-%s%s", fileType, new SimpleDateFormat("yyyy-MM-dd-hh-mm-ss").format(new Date()), randomCode, ext);
+
+
+                        String path = OSSFileService.upload(file.getInputStream(), imageName);
                         paths.add(path);
                     } catch (IOException e) {
                         e.printStackTrace();

src/main/resources/properties/outsidews.properties

@@ -1,4 +1,4 @@
-projectname=zhinengdahui
+projectname=huatai_images
 weixinapi=https://api.weixin.qq.com/sns/oauth2/
 weixinappid=wx8d16412d33eaf19c
 weixinsecret=4c16604a837d8c2929c33a03a5080e60

src/main/vue/src/pages/Login.vue

@@ -46,8 +46,8 @@ export default {
                     }).then(res => {
                         this.loading = false;
                         if (res.success) {
-                            // this.$router.replace('/');
-                            window.location = this.$baseUrl + '/admin'
+                            this.$router.replace('/');
+                            //window.location = this.$baseUrl + '/admin'
                         } else {
                             this.$message.error('登录失败');
                         }

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.25d791b9cfdf7abfb5badc5c3be0b3d0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.6d6407a59fb32a0cfab9.js></script><script type=text/javascript src=/static/js/vendor.ceb889fcdeb75f9549d6.js></script><script type=text/javascript src=/static/js/admin.34aae31bc05a250ce867.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.4cd57cd0364255899adcd7ddd1134eed.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.3a53b2c1691bd0001a30.js></script><script type=text/javascript src=/static/js/vendor.c81c6b23d91dbf49d5b2.js></script><script type=text/javascript src=/static/js/admin.98605983639c4aba09c4.js></script></body></html>

src/main/webapp/WEB-INF/html/loginAdmin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.9647b664948af8f1752259b9d1c6528e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.6d6407a59fb32a0cfab9.js></script><script type=text/javascript src=/static/js/vendor.ceb889fcdeb75f9549d6.js></script><script type=text/javascript src=/static/js/loginAdmin.33fbdcfa8936a5b4a327.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.937fd6fea972daebb75bf11762d8c4ff.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.3a53b2c1691bd0001a30.js></script><script type=text/javascript src=/static/js/vendor.c81c6b23d91dbf49d5b2.js></script><script type=text/javascript src=/static/js/loginAdmin.5c35d0d141150e13384e.js></script></body></html>

src/main/webapp/static/js/121.e8dec353b3a89a51f1ad.js → src/main/webapp/static/js/123.839e591d46c3ae65f334.js

@@ -1 +1 @@
-webpackJsonp([121],{"5LNU":function(e,t){},Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("5LNU")},"data-v-3122cd72",null);t.default=s.exports}});
+webpackJsonp([123],{"5LNU":function(e,t){},Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("5LNU")},"data-v-3122cd72",null);t.default=s.exports}});

src/main/webapp/static/js/124.ee349d973b0a438a8780.js → src/main/webapp/static/js/126.b214919c4b6a5e8cdee1.js

@@ -1 +1 @@
-webpackJsonp([124],{"8abJ":function(t,e){},izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("8abJ")},"data-v-293e7b8c",null);e.default=c.exports}});
+webpackJsonp([126],{"8abJ":function(t,e){},izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("8abJ")},"data-v-293e7b8c",null);e.default=c.exports}});