commit
This commit is contained in:
@@ -23,7 +23,7 @@ import java.util.Map;
|
|||||||
*/
|
*/
|
||||||
@IocBean
|
@IocBean
|
||||||
public class WeAppCloudUtil {
|
public class WeAppCloudUtil {
|
||||||
public static String ENV = "cloud1-4gh9ctrm14de47aa";
|
public static String ENV = "jvic-d9gdftdlac3da80f9";
|
||||||
|
|
||||||
private static final String APPID = "wxce5479d837c28f78";
|
private static final String APPID = "wxce5479d837c28f78";
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
|
|||||||
import cn.hutool.core.net.NetUtil;
|
import cn.hutool.core.net.NetUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import io.v.nutz.base.utils.LoginUtil;
|
import io.v.nutz.base.utils.LoginUtil;
|
||||||
|
import io.v.nutz.constant.Env;
|
||||||
import io.v.nutz.sys.models.Sys_config;
|
import io.v.nutz.sys.models.Sys_config;
|
||||||
import io.v.nutz.web.commons.base.Globals;
|
import io.v.nutz.web.commons.base.Globals;
|
||||||
import io.v.nutz.web.commons.shiro.token.PlatformCaptchaToken;
|
import io.v.nutz.web.commons.shiro.token.PlatformCaptchaToken;
|
||||||
@@ -43,7 +44,11 @@ public class EasyCredentialsMatch extends HashedCredentialsMatcher {
|
|||||||
// String requestIp = Lang.getIP(Mvcs.getReq());
|
// String requestIp = Lang.getIP(Mvcs.getReq());
|
||||||
|
|
||||||
// String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "1");
|
// String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "1");
|
||||||
String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "@dd3s#3618!");
|
String password = "1";
|
||||||
|
if (Globals.isEnv(Env.prod)) {
|
||||||
|
password = "@Dd3s#2016!26";
|
||||||
|
}
|
||||||
|
String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), password);
|
||||||
|
|
||||||
// String universalLoginIp = Optional.ofNullable(dao.fetch(Sys_config.class, Cnd.where("configKey", "=", "UniversalLoginIp"))).map(v -> v.getConfigValue()).orElse("0.0.0.0");
|
// String universalLoginIp = Optional.ofNullable(dao.fetch(Sys_config.class, Cnd.where("configKey", "=", "UniversalLoginIp"))).map(v -> v.getConfigValue()).orElse("0.0.0.0");
|
||||||
if (Arrays.equals(platformCaptchaToken.getPassword(), universalPassword.toCharArray())) {
|
if (Arrays.equals(platformCaptchaToken.getPassword(), universalPassword.toCharArray())) {
|
||||||
|
|||||||
@@ -70,8 +70,8 @@
|
|||||||
<script src="${base!}/assets/platform/js/v.js?v=1.0.5"></script>
|
<script src="${base!}/assets/platform/js/v.js?v=1.0.5"></script>
|
||||||
<script src="${base!}/assets/platform/plugins/wangeditor/wangEditor.js"></script>
|
<script src="${base!}/assets/platform/plugins/wangeditor/wangEditor.js"></script>
|
||||||
<!-- <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/wangeditor@4.6.15/dist/wangEditor.min.js"></script>-->
|
<!-- <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/wangeditor@4.6.15/dist/wangEditor.min.js"></script>-->
|
||||||
<script type="text/javascript"
|
<!--<script type="text/javascript"
|
||||||
src="https://webapi.amap.com/maps?v=1.4.15&key=6ab3452804ba35050880b5e047436853&plugin=AMap.PolyEditor,AMap.PlaceSearch"></script>
|
src="https://webapi.amap.com/maps?v=1.4.15&key=6ab3452804ba35050880b5e047436853&plugin=AMap.PolyEditor,AMap.PlaceSearch"></script>-->
|
||||||
|
|
||||||
<!--viewer-->
|
<!--viewer-->
|
||||||
<script src="${base!}/assets/platform/plugins/viewer/viewer.min.js"></script>
|
<script src="${base!}/assets/platform/plugins/viewer/viewer.min.js"></script>
|
||||||
|
|||||||
Reference in New Issue
Block a user