diff --git a/ebts-ui/.env.development b/ebts-ui/.env.development index 45c7f4b..adca62a 100644 --- a/ebts-ui/.env.development +++ b/ebts-ui/.env.development @@ -3,8 +3,8 @@ ENV = 'development' # EBTS/开发环境 #VUE_APP_BASE_API = '/dev-api' -VUE_APP_BASE_API = 'http://localhost:8085/dev-api' -#VUE_APP_BASE_API = 'https://api.ebts.top/dev-api' +#VUE_APP_BASE_API = 'http://localhost:8085/dev-api' +VUE_APP_BASE_API = 'https://api.ebts.top/dev-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/ebts-ui/src/components/FileUpload/index.vue b/ebts-ui/src/components/FileUpload/index.vue index 42dd992..68b753b 100644 --- a/ebts-ui/src/components/FileUpload/index.vue +++ b/ebts-ui/src/components/FileUpload/index.vue @@ -49,7 +49,7 @@ export default { // 大小限制(MB) fileSize: { type: Number, - default: 5, + default: 10, }, // 文件类型, 例如['png', 'jpg', 'jpeg'] fileType: { @@ -137,7 +137,7 @@ export default { handleUploadSuccess(res, file) { this.$message.success("提交成功!"); this.$emit("input", res.url); - this.$emit("changeAddress",res.fileName); + this.$emit("change",res.fileName); }, // 删除文件 handleDelete(index) { diff --git a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/wechat/WeChatController.java b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/wechat/WeChatController.java index cd8ccbb..81895ab 100644 --- a/ebts/ebts-admin/src/main/java/com/ebts/web/controller/wechat/WeChatController.java +++ b/ebts/ebts-admin/src/main/java/com/ebts/web/controller/wechat/WeChatController.java @@ -63,6 +63,15 @@ public class WeChatController { return ajax; } + + + + + + + + + public String getUrl(String type, String code) { String loginUrl = ""; switch (type) { diff --git a/ebts/ebts-admin/src/main/resources/application.yml b/ebts/ebts-admin/src/main/resources/application.yml index 8e272a9..b2cba0d 100644 --- a/ebts/ebts-admin/src/main/resources/application.yml +++ b/ebts/ebts-admin/src/main/resources/application.yml @@ -9,8 +9,8 @@ ebts: # 实例演示开关 demoEnabled: false # 文件路径 示例( Windows配置D:/ebts/uploadPath,Linux配置(宝塔) /www/wwwroot/ebts/uploadPath) -# profile: /www/wwwroot/gen/uploadPath - profile: D:/gen/uploadPath + profile: /www/wwwroot/gen/uploadPath +# profile: D:/gen/uploadPath # 获取ip地址开关 addressEnabled: true # 验证码类型 math 数组计算 char 字符验证 @@ -38,6 +38,17 @@ ftp: # 保护目录 prifiles: prifiles + + +md5: + #盐 + salt: clay + #秘钥 + secretKey: xinanjiaodaxinxi + + + + wechat: # 微信用户小程序appid userAppid: wx4c2099a19c69664f diff --git a/ebts/ebts-common/src/main/java/com/ebts/common/config/MD5Config.java b/ebts/ebts-common/src/main/java/com/ebts/common/config/MD5Config.java new file mode 100644 index 0000000..21a56db --- /dev/null +++ b/ebts/ebts-common/src/main/java/com/ebts/common/config/MD5Config.java @@ -0,0 +1,41 @@ +package com.ebts.common.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * @author: Clay + * @date: 2022/1/4 23:19 + * @description:AESConfig + * @email: clay@hchyun.com + */ +@Component +@ConfigurationProperties(prefix = "md5") +public class MD5Config { + + /** + * 盐 + */ + private static String salt; + /** + * 秘钥 + */ + private static String secretKey; + + + public static String getSalt() { + return salt; + } + + public void setSalt(String salt) { + MD5Config.salt = salt; + } + + public static String getSecretKey() { + return secretKey; + } + + public void setSecretKey(String secretKey) { + MD5Config.secretKey = secretKey; + } +} diff --git a/ebts/ebts-generator/pom.xml b/ebts/ebts-generator/pom.xml index dd3560c..c752c18 100644 --- a/ebts/ebts-generator/pom.xml +++ b/ebts/ebts-generator/pom.xml @@ -165,79 +165,4 @@ - - - - - com.github.wvengen - proguard-maven-plugin - 2.0.14 - - - package - - proguard - - - - - - true - pg - - - log4j-api - org.apache.logging.log4j - - - - - - - - - - - - - - - - - - - - - - - - - - - D:/Java/jdk1.8/lib/rt.jar - D:/Java/jdk1.8/lib/jce.jar - - - - ebts-generator-1.0.0.jar - ebts-generator.jar - - - - \ No newline at end of file