Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
commit
d3f2023ec8
|
@ -110,10 +110,11 @@ public class ChatLogic {
|
|||
char[] original = unSymbolWord.toCharArray();
|
||||
char[] tmpChar = tmp.toCharArray();
|
||||
int j=0;
|
||||
int length = original.length;
|
||||
char[] result = new char[chars.length];
|
||||
for(int i=0;i<chars.length;i++){
|
||||
char c= chars[i];
|
||||
if(original[j] == chars[i]){
|
||||
if(j<length && original[j] == chars[i]){
|
||||
c = tmpChar[j];
|
||||
j++;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,35 @@
|
|||
package com.ljsd.jieling.kefu;
|
||||
|
||||
import com.ljsd.jieling.db.mongo.MongoUtil;
|
||||
import com.ljsd.jieling.logic.OnlineUserManager;
|
||||
import com.ljsd.jieling.logic.dao.UserManager;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.network.server.ProtocolsManager;
|
||||
import com.ljsd.jieling.util.AyncWorkerRunnable;
|
||||
import com.ljsd.jieling.util.AyyncWorker;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Cmd_fixindb extends GmAbstract{
|
||||
@Override
|
||||
public boolean exec(String[] args) throws Exception {
|
||||
List<User> userList = MongoUtil.getInstence().getMyMongoTemplate().findAll(User.getCollectionName(), User.class);
|
||||
userList.forEach(user -> {
|
||||
try {
|
||||
User userInMem = UserManager.getUser(user.getId());
|
||||
AyyncWorker ayyncWorker = new AyyncWorker(userInMem, true, new AyncWorkerRunnable() {
|
||||
@Override
|
||||
public void work(User user) throws Exception {
|
||||
MongoUtil.getLjsdMongoTemplate().save(user);
|
||||
}
|
||||
});
|
||||
ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker);
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
});
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
|
@ -19,6 +19,7 @@ import com.ljsd.jieling.util.MessageUtil;
|
|||
import config.SActivityRewardConfig;
|
||||
import config.SGlobalActivity;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
@ -79,9 +80,12 @@ public class NewWelfareActivity extends AbstractActivity {
|
|||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
||||
}
|
||||
}
|
||||
for(ActivityProgressInfo activityProgressInfo : activityProgressInfoMap.values()){
|
||||
activityProgressInfo.setState(2);
|
||||
for(Map.Entry<Integer,ActivityProgressInfo> item: activityProgressInfoMap.entrySet()){
|
||||
item.getValue().setState(2);
|
||||
activityMission.updateProgressInfo(item.getKey(),item.getValue());
|
||||
}
|
||||
|
||||
|
||||
sendActivityProgress(session, activityMission, null);
|
||||
List<SActivityRewardConfig> sActivityRewardConfigs = SActivityRewardConfig.getsActivityRewardConfigByActivityId(id);
|
||||
CommonProto.Drop.Builder drop = ItemUtil.drop(user, sActivityRewardConfigs.get(0).getReward(), BIReason.TAKE_ACTIVITY_REWARD);
|
||||
|
@ -107,6 +111,12 @@ public class NewWelfareActivity extends AbstractActivity {
|
|||
for(ActivityProgressInfo activityProgressInfo : activityProgressInfoMap.values()){
|
||||
activityProgressInfo.setState(2);
|
||||
}
|
||||
|
||||
for(Map.Entry<Integer,ActivityProgressInfo> item: activityProgressInfoMap.entrySet()){
|
||||
item.getValue().setState(2);
|
||||
activityMission.updateProgressInfo(item.getKey(),item.getValue());
|
||||
}
|
||||
|
||||
List<SActivityRewardConfig> sActivityRewardConfigs = SActivityRewardConfig.getsActivityRewardConfigByActivityId(id);
|
||||
itemAttrs.add(sActivityRewardConfigs.get(0).getReward());
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue