hwf453
/
ZHDCOA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改密码漏洞修复完成

Browse Source
master
修改密码漏洞修复完成 1 year ago
parent 55dee9064e
commit b5c39dd289
6 changed files with 54 additions and 24 deletions
Show Stats Download Patch File Download Diff File

4
app/build.gradle
Unescape Escape View File

@ -11,8 +11,8 @@ android {
applicationId "com.rehome.zhdcoa"
minSdk 24
targetSdk 34
versionCode 13
versionName "2.2.9"
versionCode 14
versionName "2.3.0"
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
//每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装

9
app/src/main/java/com/rehome/zhdcoa/bean/YzmBean.java
Unescape Escape View File

@ -40,6 +40,7 @@ public class YzmBean {
private String UserID;
private String token;
private String token_exp;
public String getResult() {
return result;
@ -72,5 +73,13 @@ public class YzmBean {
public void setToken(String token) {
this.token = token;
}
public String getToken_exp() {
return token_exp;
}
public void setToken_exp(String token_exp) {
this.token_exp = token_exp;
}
}
}

14
app/src/main/java/com/rehome/zhdcoa/ui/activity/LoginActivity.kt
Unescape Escape View File

@ -155,16 +155,6 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
override fun initData() {
binding.tvVersionCode.text = getString(R.string.version_code) + getVersionName()
// AndPermission.with(this).runtime().permission(
// Permission.READ_PHONE_STATE,
// Permission.READ_EXTERNAL_STORAGE,
// Permission.WRITE_EXTERNAL_STORAGE,
// Permission.CAMERA
// ).onGranted { }.onDenied { }
// .start()
val UserIDTemp = SPUtils.get(context, Contans.SP.USER_NAME, "") as String
val UserPwdTemp = SPUtils.get(context, Contans.SP.PASS_WORD, "") as String
@ -180,8 +170,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
if (BuildConfig.LOG_ERROR) {
// 管理员
binding.etUsername.setText("ZHPS_Admin")
binding.etPassword.setText("Rehome.zhps@996")
// binding.etUsername.setText("ZHPS_Admin")
// binding.etPassword.setText("Rehome.zhps@996")
//马
// binding.etUsername.setText("310482")

10
app/src/main/java/com/rehome/zhdcoa/ui/activity/WjmmActivity.kt
Unescape Escape View File

@ -32,6 +32,7 @@ class WjmmActivity : BaseActivityOaToolbarViewBinding<ActivityWjmmBinding>() {
private lateinit var gh: String
private lateinit var sjh: String
private lateinit var token: String
private lateinit var token_exp: String
@ -52,6 +53,7 @@ class WjmmActivity : BaseActivityOaToolbarViewBinding<ActivityWjmmBinding>() {
gh = intent.getStringExtra("gh")!!
sjh = intent.getStringExtra("sjh")!!
token = intent.getStringExtra("token")!!
token_exp = intent.getStringExtra("token_exp")!!
}
override fun initData() {
@ -68,10 +70,12 @@ class WjmmActivity : BaseActivityOaToolbarViewBinding<ActivityWjmmBinding>() {
param["telphone"] = sjh
param["newpassword"] = Objects.requireNonNull<Editable>(binding.xmm.text).toString().trim()
param["token"] = token
param["token_exp"] = token_exp
val json = Gson().toJson(param)
val jsonEncrypt = RSAUtils.encryptBASE64Str(json)
showLog(json);
showLog(jsonEncrypt)
return jsonEncrypt
}
@ -83,7 +87,7 @@ class WjmmActivity : BaseActivityOaToolbarViewBinding<ActivityWjmmBinding>() {
request.setDefineRequestBodyForJson(json)
showLog(url)
NohttpUtils.getInstance().add(this, 0, request, object : HttpListener<String?> {
NohttpUtils.getInstance().add(this, 0,token, request, object : HttpListener<String?> {
override fun onSucceed(what: Int, response: com.yolanda.nohttp.rest.Response<String?>?) {
val jsonResult = response?.get()
@ -108,8 +112,8 @@ class WjmmActivity : BaseActivityOaToolbarViewBinding<ActivityWjmmBinding>() {
) { dialog, _ ->
//设置确定按钮
dialog.dismiss() //关闭dialog
AppManager.getAppManager().finishActivity(WjmmGetVerificationCodeActivity::class.java)
finish()
//AppManager.getAppManager().finishActivity(WjmmGetVerificationCodeActivity::class.java)
//finish()
}
//参数都设置完成了，创建并显示出来
builder.create().show()

20
app/src/main/java/com/rehome/zhdcoa/ui/activity/WjmmGetVerificationCodeActivity.kt
Unescape Escape View File

@ -39,6 +39,7 @@ class WjmmGetVerificationCodeActivity :
BaseActivityOaToolbarViewBinding<ActivityWjmmGetVerificationCodeBinding>() {
private var token: String = ""
private var token_exp: String = ""
override fun getViewBinding() = ActivityWjmmGetVerificationCodeBinding.inflate(layoutInflater)
@ -85,8 +86,8 @@ class WjmmGetVerificationCodeActivity :
}
})
binding.txGh.setText("ZHPS_Admin")
binding.sjh.setText("13600341775")
// binding.txGh.setText("ZHPS_Admin")
// binding.sjh.setText("15307858521")
}
private fun getYzm() {
@ -130,6 +131,9 @@ class WjmmGetVerificationCodeActivity :
if(bean.rows[0].token!=null){
token = bean.rows[0].token
}
if(bean.rows[0].token_exp!=null){
token_exp = bean.rows[0].token_exp
}
} else {
if (bean != null) {
showToast(bean.rows[0].msg)
@ -188,7 +192,7 @@ class WjmmGetVerificationCodeActivity :
request.setDefineRequestBodyForJson(json)
showLog(url)
NohttpUtils.getInstance().add(this, 0, request, object : HttpListener<String?> {
NohttpUtils.getInstance().add(this, 0,token, request, object : HttpListener<String?> {
override fun onSucceed(what: Int, response: com.yolanda.nohttp.rest.Response<String?>?) {
val jsonResult = response?.get()
@ -210,12 +214,13 @@ class WjmmGetVerificationCodeActivity :
)
intent.putExtra("gh", binding.txGh.text.toString().trim())
intent.putExtra("sjh", binding.sjh.text.toString().trim())
if(TextUtils.isEmpty(token)){
intent.putExtra("token", "")
}else{
if(!TextUtils.isEmpty(token)){
intent.putExtra("token", token)
}
intent.putExtra("token_exp", token_exp)
startActivity(intent)
}else{
showToast("验证码校验失败")
}
} else {
if (bean != null) {
showToast(bean.rows[0].msg)
@ -278,6 +283,7 @@ class WjmmGetVerificationCodeActivity :
param["telphone"] = Objects.requireNonNull<Editable>(binding.sjh.text).toString().trim()
param["verificationcode"] = Objects.requireNonNull<Editable>(binding.yzm.text).toString().trim()
param["token"] = token
param["token_exp"] = token_exp
val json = Gson().toJson(param)
val jsonEncrypt = RSAUtils.encryptBASE64Str(json)

21
app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java
Unescape Escape View File

@ -88,6 +88,27 @@ public class NohttpUtils {
mQueue.add(what, request, new HttpResponseListener<T>(mActivity, request, callback, canCanel, isLoading, msg));
}
/**
* 添加请求
*
* @param mActivity activity
* @param what 请求码，用来区分队列中的请求
* @param token token
* @param request 请求
* @param callback 请求回调
* @param canCanel 是否可以取消请求
* @param isLoading 是否弹出对话框
* @param <T>
*/
public <T> void add(Activity mActivity, int what,String token, Request<T> request, HttpListener<T> callback, boolean canCanel, boolean isLoading, String msg) {
if(token!=null){
String credential = "Bearer " + token;
request.addHeader("Authorization", credential);
showLog(request.url());
}
mQueue.add(what, request, new HttpResponseListener<T>(mActivity, request, callback, canCanel, isLoading, msg));
}
public <T> void add(Activity mActivity, int what, Request<T> request, HttpListener<T> callback) {
if(App.getInstance().getUserInfo()!=null&&App.getInstance().getUserInfo().getToken()!=null){

Write Preview
Loading…
Cancel
Save